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

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

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

@@ -291,7 +291,7 @@
    }

    /**
     * 转化dateTimeStr为Date类型
     * 转化dateTimeStr为Date类型 去除时间
     *
     * @param dateTimeStr
     * @return