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: fd6e04e1a5cef021da4c615ab3b5b7dda9decf59
+  newTag: 6c0de74014d3c9108d7956c6e97f78d484623c88

src/main/java/com/mmc/pms/service/mall/impl/MallGoodsServiceImpl.java

@@ -412,6 +412,12 @@ public class MallGoodsServiceImpl implements MallGoodsService {
         Integer pageNo = param.getPageNo();
         param.buildCurrentPage();
         mallGoodsList = mallGoodsDao.listMallGoods(param);
+        for(MallGoodsDO mallGoodsDO : mallGoodsList) {
+            List<PriceStockDO> priceStockDOS = mallGoodsDao.listPriceStock(mallGoodsDO.getId());
+            if(priceStockDOS != null) {
+                mallGoodsDO.setPriceStockDOS(priceStockDOS);
+            }
+        }
         List<MallGoodsVO> pageList = mallGoodsList.stream().map(MallGoodsDO::buildListMallGoodsVO).collect(Collectors.toList());
         setCompanyName(pageList);
         return PageResult.buildPage(pageNo, param.getPageSize(), count, pageList);