Merge branch 'dev' into pre-production

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml

@@ -52,10 +52,10 @@
             and si.assess_dept = #{params.assessDept}
         </if>
         <if test="params.startTime != null and params.startTime != ''" >
-            and si.date_format(create_time,'%y%m%d%') >= date_format(#{params.startTime},'%y%m%d%')
+            and date_format(si.create_time,'%y%m%d%') >= date_format(#{params.startTime},'%y%m%d%')
         </if>
         <if test="params.endTime != null and params.endTime != ''" >
-            and si.date_format(create_time,'%y%m%d%') &lt;= date_format(#{params.endTime},'%y%m%d%')
+            and date_format(si.create_time,'%y%m%d%') &lt;= date_format(#{params.endTime},'%y%m%d%')
         </if>
     </select>