czg_team/cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source 
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
This commit is contained in:
张松
2024-11-26 15:26:37 +08:00
parent 2d65fc817c aa9ee6f557
commit d7c55da8c6
3 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/mapper/TbOrderDetailMapper.xml
View File

@@ -18,10 +18,11 @@
<result column="price" jdbcType="DECIMAL" property="price"/>
<result column="price_amount" jdbcType="DECIMAL" property="priceAmount"/>
<result column="pack_amount" jdbcType="DECIMAL" property="packAmount"/>
<result column="is_temporary" jdbcType="INTEGER" property="isTemporary"/>
</resultMap>
<sql id="Base_Column_List">
id, order_id, shop_id, product_id, product_sku_id, num, product_name, product_sku_name,
product_img, create_time, update_time, price, price_amount,status,pack_amount,return_num
product_img, create_time, update_time, price, price_amount,status,pack_amount,return_num,is_temporary
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select