Merge branch 'develop' into release

tuoheng-admin/src/main/java/com/tuoheng/admin/entity/request/goods/QueryGoodsListByWarehouseIdRequest.java

@@ -23,6 +23,11 @@ public class QueryGoodsListByWarehouseIdRequest implements Serializable {
      */
     private Integer warehouseId;
 
+    /**
+     * 物资类型
+     */
+    private Integer goodsType;
+
     /**
      * 物资名称
      */

tuoheng-admin/src/main/resources/mapper/GoodsMapper.xml

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="1 == 1"> and g.mark = 1 </if>
             <if test="tenantId != null "> and g.tenant_id = #{tenantId}</if>
             <if test="warehouseId != null "> and g.warehouse_id = #{warehouseId}</if>
+            <if test="goodsType != null "> and g.goods_type = #{goodsType}</if>
             <if test="goodsName != null and goodsName != ''">
                 and g.goods_name like concat('%',#{goodsName},'%')
             </if>