Merge remote-tracking branch 'origin/master'

fuliqi

2024-07-22 6039b5f7fa82870ceb4c3173c8fa0721f5cee7bd

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

@@ -7,9 +7,9 @@
    <select id="selectAll" resultType="com.ycl.platform.domain.entity.TContract">
        select a.*, b.unit_name
        from t_contract a
                 left join t_yw_unit b on a.unit_id = b.id and b.deleted = '0'
        where a.deleted = '0'
                 left join t_yw_unit b on a.unit_id = b.id and b.deleted = 0
        where a.deleted = 0
        order by create_time desc
    </select>

</mapper>
</mapper>