Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: b89a1fddfb594fdf872dec5aa2ef0722094ca463
+  newTag: 72a00d892bf3e44f20d3a0b01aa69de883c827b0

src/main/java/com/mmc/pms/model/lease/qo/LeaseGoodsQO.java

@@ -41,6 +41,9 @@ public class LeaseGoodsQO implements Serializable {
     private String districtCode;
 
 
+    @ApiModelProperty(value = "型号id")
+    private Integer modelInfoId;
+
     @ApiModelProperty(value = "页码", required = true)
     @NotNull(message = "页码不能为空", groups = Page.class)
     @Min(value = 1, groups = Page.class)

src/main/resources/mapper/lease/LeaseGoodsDao.xml

@@ -438,6 +438,9 @@
             <if test="districtCode != null and districtCode != ''">
                 and district_code = #{districtCode}
             </if>
+            <if test="modeInfoId != null and modeInfoId != ''">
+                and device_mode_id = #{modeInfoId}
+            </if>
         </where>
     </select>
     <select id="listLeaseGoodsByApp" resultMap="leaseGoodsMap">
@@ -484,6 +487,9 @@
             <if test="districtCode != null and districtCode != ''">
                 and district_code = #{districtCode}
             </if>
+            <if test="modeInfoId != null and modeInfoId != ''">
+                and device_mode_id = #{modeInfoId}
+            </if>
         </where>
         order by lg.shelf_status DESC, lg.sort DESC
     </select>