Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!603

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsMgrController.java

@@ -290,9 +290,9 @@ public class GoodsMgrController extends BaseApiController {
         goods.setExchangePrice(firstGoodsSku.getExchangePrice());
         goods.setValue(firstGoodsSku.getValue());
         goods.setCost(firstGoodsSku.getCost());
-        if (null == firstGoodsSku.getOriginPrice()) {
-          goods.setOriginPrice(0);
-        }
+//        if (null == firstGoodsSku.getOriginPrice()) {
+//          goods.setOriginPrice(0);
+//        }
         if (null == firstGoodsSku.getDiscountRate()) {
           goods.setDiscountRate(goodsParam.getDiscountRate());
         } else {