Merge remote-tracking branch 'origin/master'

This commit is contained in:
God
2024-07-25 11:05:33 +08:00
2 changed files with 13 additions and 12 deletions

View File

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

View File

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