Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-31 1aa2a59a237dbc4c58a5e3d09be2bfeaf1535c8b

 ycl-server/src/main/java/com/ycl/platform/mapper/TContractMapper.java

@@ -23,5 +23,5 @@
    IPage<ContractVO> getPage(IPage page, @Param("query") ContractQuery query);


    List<CalculateRuleVO> selectByRuleName(String ruleName, String ruleCondition, Date date);
    List<CalculateRuleVO> getCalculateRule(Date date);
}