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: a17e0d30c07963c2f183aed1b14a3520a0d04ee3
+  newTag: 44c4f3279675a28d348c4d91c0db1df1d9e0ff32

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

@@ -438,8 +438,8 @@
             <if test="districtCode != null and districtCode != ''">
                 and district_code = #{districtCode}
             </if>
-            <if test="modeInfoId != null and modeInfoId != ''">
-                and device_mode_id = #{modeInfoId}
+            <if test="modelInfoId != null and modelInfoId != ''">
+                and device_mode_id = #{modelInfoId}
             </if>
         </where>
     </select>
@@ -487,8 +487,8 @@
             <if test="districtCode != null and districtCode != ''">
                 and district_code = #{districtCode}
             </if>
-            <if test="modeInfoId != null and modeInfoId != ''">
-                and device_mode_id = #{modeInfoId}
+            <if test="modelInfoId != null and modelInfoId != ''">
+                and device_mode_id = #{modelInfoId}
             </if>
         </where>
         order by lg.shelf_status DESC, lg.sort DESC