Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

sen

2025-09-29 e6a9f5e801495e965eb1dbe40fcf9dd5df4eb6a5

Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

 service/src/main/resources/mapper/cwgl/EstimatedReceivableBillMapper.xml

@@ -42,6 +42,8 @@
        <if test="status != null "> and thisTab.status = #{status}</if>
        <if test="confirmTime != null "> and thisTab.confirm_time = #{confirmTime}</if>
        <if test="deleted != null "> and thisTab.deleted = #{deleted}</if>
        <if test="createTimeBegin != null and createTimeBegin!='' and createTimeEnd != null and createTimeEnd!='' "> and thisTab.create_time between #{createTimeBegin} and #{createTimeEnd}</if>

    </sql>

    <!--查询-->