Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-11-15 f6eada9ffd2fe2b8fdf45e2cc51d4290704ab24a

 screen-common/src/main/java/com/moral/util/MybatisPLUSUtils.java

@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.baomidou.mybatisplus.core.conditions.segments.NormalSegmentList;
import com.moral.constant.SeparateTableType;
import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;

import java.text.ParseException;
import java.text.SimpleDateFormat;