Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-05 cd24a045bd9ee29505ddc9760d25f5d4037f4f0c

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java

@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.CalculateReport;
import enumeration.general.CalculateReportStatusEnum;
import lombok.Data;
import org.springframework.beans.BeanUtils;
import org.springframework.lang.NonNull;
@@ -48,6 +49,8 @@
    /** 核算规则 */
    private List<CalculateMoneyRuleVO> ruleList;

    private CalculateReportStatusEnum status;

    public static CalculateReportDetailVO getVoByEntity(@NonNull CalculateReport entity, CalculateReportDetailVO vo) {
        if(vo == null) {
            vo = new CalculateReportDetailVO();