Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: b0ee0edf8c9f15c6a46952f5ce304a1216db1c3a
+  newTag: ec6c5f9b47b89fe04c8dd17fdac64b2edf8c0a69

src/main/resources/mapper/WebProductMallDao.xml

@@ -108,7 +108,7 @@
                 and (gi.quality_id = #{qualityId})
             </if>
             <if test="productCategoryId != null">
-                and (gi.sort_type_id = #{productCategoryId})
+                and (gi.goods_category_id = #{productCategoryId})
             </if>
         </where>
         ORDER BY