Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-23 e4e8b637d3672be025dd0b119dc66a5300e3ca85

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

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

    private Long contractId;

}