Merge remote-tracking branch 'origin/master'

hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java

@@ -88,7 +88,7 @@ public class EmInfoController extends BladeController {
 	})
 	@OperationAnnotation(moduleName = "设备管理",title = "设备信息",operatorType = OperatorType.MOBILE,businessType =
 			BusinessType.GENCODE,
-			action = "分页条件")
+			action = "分页查询设备信息列表")
 	public R<IPage<EmInfoEntity>> list(@ApiIgnore @RequestParam Map<String, Object> em_info, Query query) {
 		QueryWrapper<EmInfoEntity> queryWrapper = Condition.getQueryWrapper(em_info, EmInfoEntity.class);
 		queryWrapper.lambda().eq(EmInfoEntity::getGpid, 0);

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/StatisticsMapper.xml

@@ -10,7 +10,7 @@
                  module_name like concat('%',#{statistics.moduleName},'%')
              </if>
             <if test="statistics.createTime != null">
-                date_format(date_calculated,'%Y-%m-%d') &gt;= #{statistics.createTime}
+               and date_format(date_calculated,'%Y-%m-%d') &gt;= #{statistics.createTime}
             </if>
              <if test="statistics.endTime != null">
                and  date_format(date_calculated,'%Y-%m-%d') &lt;= #{statistics.endTime}