Merge branch 'feature-bieao' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/MaintenanceRecord.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Range;
 
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.PastOrPresent;
 import java.math.BigDecimal;
@@ -156,6 +157,7 @@ public class MaintenanceRecord extends BaseEntity {
 	/**
 	 * 维保工签名1
 	 */
+	@NotEmpty(message = "维保工签名1不能为空")
 	private String signatureImg1;
 
 	/**

lift-business-service/src/main/java/cn/com/ty/lift/business/project/controller/ProjectAppController.java

@@ -121,7 +121,7 @@ public class ProjectAppController {
     @PostMapping("record/modify")
     @Validation(fields = {"recordImageList"})
     public RestResponse modify(@Val @RequestBody MaintenanceRecordRequest request) {
-        Validator.valid(request.getRecord(), "id");
+        Validator.valid(request.getRecord(), "id", "signatureImg1");
         return maintenanceRecordService.modify(request);
     }
 

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectLiftRelevanceService.java

@@ -272,7 +272,7 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
         for (ProjectLiftRelevance entry : list){
             sendMessage(entry.getProjectId(), entry.getMtCompanyId(), entry.getLiftId(), entry.getWorkerId(), newWorkerId);
         }
-        return RestResponse.success(MessageUtils.get("msg.modify.success"));
+        return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
     }
 
     /**