Merge remote-tracking branch 'origin/master'

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SafetyToolEntity.java

@@ -68,7 +68,8 @@ public class SafetyToolEntity extends TenantEntity {
 	@ApiModelProperty(value = "通知用户")
 	private String noticeUsers;
 
-
+	@ApiModelProperty(value = "提前让推送天数")
+	private Integer advanceNoticeDays;
 
 	@ApiModelProperty(value = "模板Id")
 	private Long messageTemplateId;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolController.java

@@ -122,7 +122,7 @@ public class SafetyToolController extends BladeController {
 	@PostMapping("/batchRecheck")
 	@ApiOperationSupport(order = 52)
 	@ApiOperation(value = "复核、批量审核")
-	public R<IPage<SafetyToolVO>> batchRecheck(@RequestBody SafetyToolBatchRecheckDTO req) {
+	public R batchRecheck(@RequestBody SafetyToolBatchRecheckDTO req) {
 		safetyToolService.doBatchRecheck(req);
 		return R.status(true);
 	}

hzims-service/safeproduct/src/main/resources/db/1.0.2.sql

@@ -1 +1 @@
-alter table `hzims_oper_maintenance_task` add column `is_delay` tinyint(2) default 0 comment '是否延期';
+alter table `hzims_safe_safety_tool` add column `advance_notice_days` tinyint(4) default 0 comment '安全工器具提前通知天数';