Merge remote-tracking branch 'origin/develop' into 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: ad8e7c0706ef7739f5f906212bfa1d6b34458137
+  newTag: 435cb57b9862dcdf531aab27c77b392bd3bbdf73

src/main/resources/mapper/ProductDao.xml

@@ -430,7 +430,7 @@
         gi.is_deleted,
         mpsi.id as mall_prod_info_id,
         mpsi.is_deleted as sku_info_deleted,
-        gt.name as goods_type_name,psk.id, psk.product_name,psk.model,psk.brand_info_id,
+        psk.id, psk.product_name,psk.model,psk.brand_info_id,
         mpsis.id as mall_prod_info_spec_id,
         mpsis.is_deleted as sku_spec_deleted,
         psc.id as product_spec_id,psc.spec_name,psc.spec_image as prod_sku_spec_image,psc.part_no,psc.version_desc,
@@ -444,7 +444,6 @@
         INNER JOIN product_spec psc ON mpsis.product_spec_id = psc.id
         INNER JOIN product psk ON psk.id = psc.product_id
         INNER JOIN goods_img gimg ON gi.id = gimg.goods_info_id and gimg.img_type = 0
-        INNER JOIN categories gt ON psk.categories_id = gt.id
         LEFT JOIN sku_unit su ON su.id = mpsi.sku_unit_id
         left join brand_info bi on bi.id = psk.brand_info_id
         <where>