Merge remote-tracking branch 'origin/feature-201837-wangcz' into feature-201837-wangcz

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -3548,8 +3548,10 @@ public class GoodsServiceImpl implements GoodsService {
      */
     @Override
     public void defineGoodsInfo(Goods goods) {
+        // 商家为寄售时；商家名称要显示终端卖家的名称
         if (sysConf.getStoreid().equals(goods.getStoreid())) {
             goods.setSelfSale(StringConstant.CONSIGNMENT);
+            goods.setStoreName(goods.getEnterpriseName());
         } else {
             goods.setSelfSale(StringConstant.SALE_SELF);
         }