Merge branch 'master' into dev

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -1768,11 +1768,6 @@
             <if test="fIfdamage != null  and fIfdamage != ''">and tw.f_ifdamage = #{fIfdamage}</if>
             <if test="fBankcorpid != null  and fBankcorpid != ''">and tw.f_bankcorpid = #{fBankcorpid}</if>
             <if test="fBilltype != null  and fBilltype != ''">and tw.f_billtype = #{fBilltype}</if>
-            <if test="fBillstatus == null">
-                and tw.f_updete_status = 2
-                and tw.f_submit_update = 2
-                and tw.f_delete_status = 2
-            </if>
             <if test="fBillstatus != null and (fBillstatus == 4 or fBillstatus == 6 or fBillstatus == 9 or fBillstatus == 11)">
                 and tw.f_billstatus = #{fBillstatus}
                 and tw.f_updete_status = 2
@@ -2021,11 +2016,6 @@
             <if test="fIfdamage != null  and fIfdamage != ''">and tw.f_ifdamage = #{fIfdamage}</if>
             <if test="fBankcorpid != null  and fBankcorpid != ''">and tw.f_bankcorpid = #{fBankcorpid}</if>
             <if test="fBilltype != null  and fBilltype != ''">and tw.f_billtype = #{fBilltype}</if>
-            <if test="fBillstatus == null">
-            and tw.f_updete_status = 2
-            and tw.f_submit_update = 2
-            and tw.f_delete_status = 2
-            </if>
             <if test="fBillstatus != null and (fBillstatus == 4 or fBillstatus == 6 or fBillstatus == 9 or fBillstatus == 11)">
                 and tw.f_billstatus = #{fBillstatus}
                 and tw.f_updete_status = 2