Merge remote-tracking branch 'origin/master'

xiangpei

2024-04-28 387d3aca6fab1a07618bb8342ee522b3da2db9b1

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/CalculateReportForm.java

@@ -46,10 +46,6 @@
    @ApiModelProperty("哪月的")
    private Integer whichMonth;

    @NotNull(message = "修改人不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("修改人")
    private Long updateBy;

    public static CalculateReport getEntityByForm(@NonNull CalculateReportForm form, CalculateReport entity) {
        if(entity == null) {
          entity = new CalculateReport();