Merge branch 'fengcang' into busUser

api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml

@@ -235,6 +235,9 @@
             <if test="invStorageCode != '' and invStorageCode != null">
                 AND invStorageCode like concat('%', #{invStorageCode,jdbcType=VARCHAR}, '%')
             </if>
+            <if test="invWarehouseCode != '' and invWarehouseCode != null">
+                AND invWarehouseCode like concat('%', #{invWarehouseCode,jdbcType=VARCHAR}, '%')
+            </if>
             <if test="batchNo != '' and batchNo != null">
                 AND ip.batchNo like concat('%', #{batchNo,jdbcType=VARCHAR}, '%')
             </if>