Merge remote-tracking branch 'origin/master'

fuliqi

2024-04-30 ec5a6ede3f88abebdf7a280744ea762757f310aa

 ycl-server/src/main/resources/mapper/zgyw/CalculateRuleMapper.xml

@@ -47,7 +47,7 @@
        from t_calculate_rule
        where deleted = 0
          and contract_id
            in (select id from t_contract where unit_id = #{unitId})
            in (select id from t_contract where unit_id = #{unitId} and deleted = 0 and start_time <![CDATA[ <=  ]]> #{now} and end_time >= #{now} )
    </select>

    <insert id="insertDefaultRule" useGeneratedKeys="true" keyProperty="id">