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

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EmphasisTripPieDetailFormDTO.java

@@ -15,7 +15,7 @@ public class EmphasisTripPieDetailFormDTO implements Serializable {
 
     public interface EmphasisTripPieDetailForm{}
 
-    @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class})
+//    @NotBlank(message = "code不能为空",groups = {EmphasisTripPieDetailForm.class})
     private String code;
 
     private String customerId;

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java

@@ -464,7 +464,6 @@ public class IcTripReportRecordController implements ResultDataResolver {
      */
     @PostMapping("emphasisTripPieDetail")
     public Result<List<EmphasisTripPieDetailResultDTO>> emphasisTripPieDetail(@RequestBody EmphasisTripPieDetailFormDTO formDTO, @LoginUser TokenDto tokenDto){
-        ValidatorUtils.validateEntity(formDTO,EmphasisTripPieDetailFormDTO.EmphasisTripPieDetailForm.class);
         formDTO.setStaffId(tokenDto.getUserId());
         formDTO.setCustomerId(tokenDto.getCustomerId());
         return new Result<List<EmphasisTripPieDetailResultDTO>>().ok(icTripReportRecordService.emphasisTripPieDetail(formDTO));