Merge remote-tracking branch 'origin/master'

fuliqi

2024-04-26 7a7dbbd34179b79caf3b74dedf2d5b84f30d0c05

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

@@ -24,6 +24,13 @@

    /** 核算规则 */
    private Integer ruleId;
    private String ruleName;
    /** 扣减方式 */
    private String deductCategory;
    /** 规则描述 */
    private String ruleDesc;
    /** 规则条件 */
    private String ruleCondition;

    /** 合同 */
    private Integer contractId;