Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-23 f5e1051a7e6d3ffccc815a631d8be372d772c58f

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

@@ -33,4 +33,6 @@
     */
    private Integer calcUnit;

    private Long contractId;

}