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

src/main/java/com/yxproject/start/mapper/LogMapper.java

@@ -84,7 +84,7 @@ public interface LogMapper {
             "            and NEW_FILES.DWDM=#{uploadCountyCode}" +
             "            </if>" +
             "            <if test='createDate !=\"\"' >" +
-            "            and NEW_FILES.CREATE_DATE=#{createDate}" +
+            "            and substr(NEW_FILES.CREATE_DATE,0,8)=#{createDate}" +
             "            </if>" +
             "            <if test='cardId !=\"\"' >" +
             "            and PREPRO_PERSON.GMSFHM=#{cardId} " +