Merge remote-tracking branch 'origin/master'

xuhy

10 小时以前 ae729b5af85b7df9aa9e2c0bb3e5fb6115f1ca9e

 ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml

@@ -186,7 +186,7 @@
        LEFT JOIN t_crm_supplier t4 on t3.supplier_clinic_id = t4.id
        LEFT JOIN t_erp_supplier_outbound_goods t5 on t5.warehousing_batch_id =t1.id
        where t2.disabled = 0 and t2.warehouse_id = #{warehouseId}
        and #{time} > t1.expiry_date
        and #{endDate} > t1.expiry_date
        <if test="user.roleType !=null and user.roleType ==4">
            and t3.supplier_clinic_id =#{supplierClinicId} and t3.goods_source=1
        </if>