Merge remote-tracking branch 'origin/master'

zzw

2023-11-28 7748cd8a79548e94299d24e080c4650924a215da

 modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml

@@ -4,10 +4,11 @@
<mapper namespace="com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderDao">

    <select id="getList" resultType="com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder">
        select a.*
        select a.*, p.*
        from item_circulat_order a
        INNER JOIN  project p ON p.id = a.project_id
        <where>
            a.is_delete = 0
            a.is_delete = 0 and p.is_delete = 0
            <if test="whereSql!=null">
                and ${whereSql}
            </if>
@@ -17,4 +18,5 @@
        </if>
    </select>


</mapper>