Merge remote-tracking branch 'origin/master'

fuliqi

2024-04-30 a562df3729551d8deebf87e96b0a5e8f6a6c30d1

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

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

    private Long contractId;

}