Merge remote-tracking branch 'origin/master'

src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml

@@ -35,20 +35,21 @@
         where s.sid=#{sid}
     </select>
     <select id="getGoodsForSales" resultType="com.yxt.goods.biz.goodsspu.SalesGoodsVo">
-        select
-        s.sid as goodSpuSid,
-        s.goodsName as goodsSpuName,
-        sku.sid as goodsSkuSid,
+        SELECT
+        s.sid AS goodSpuSid,
+        s.goodsName AS goodsSpuName,
+        sku.sid AS goodsSkuSid,
         sku.goodsSkuCode,
-        sku.title as goodsSkuTitle,
-        s.goodsUnitName as unit,
-        e.salesPrice as price,
+        sku.title AS goodsSkuTitle,
+        s.goodsUnitName AS unit,
+        e.salesPrice AS price,
         e.picUrl,
         e.costPrice,
         e.standardPurchasePrice
-        from goods_spu s
-        left join goods_sku sku on a.sid = sku.goodsSpuSid
-        left join goods_sku_extend e on sku.sid = e.goodsSkuSid
+        FROM
+        goods_spu s
+        LEFT JOIN goods_sku sku ON s.sid = sku.goodsSpuSid
+        LEFT JOIN goods_sku_extend e ON sku.sid = e.goodsSkuSid
         <where>
             ${ew.sqlSegment}
         </where>

src/main/resources/application.yml

@@ -2,9 +2,9 @@ spring:
   application:
     name: ss-common-goods
   profiles:
-#    active: dev
+    active: dev
 #    active: test
-    active: pro
+#    active: pro
   messages:
     # 国际化资源文件路径
     basename: i18n/messages