Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-06 a1fa7f56d0b99e30ada3b2f8d90c19787973fb53

 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);
}