Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

lxw

2023-11-10 c8a73f64e981c347b5d9413ec6fd5603bdebfc39

 src/main/java/com/whyc/service/WorksheetMainService.java

@@ -912,7 +912,7 @@
            query.eq("create_user_id",createUserId);
        }
        query.ge("begin_time",beginTime);
        query.le("end_time",endTime);
        query.le("begin_time",endTime);
        if(type!=null && type>=0){
            query.eq("type",type);
        }