suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cc_20250211_v2.6

Browse Source 
# Conflicts:
#	coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
This commit is contained in:
shuo.wang
2025-02-26 16:33:58 +08:00
parent f8c6baf98f f4e50da499
commit 490b06946c
6 changed files with 106 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
View File

@@ -391,7 +391,8 @@
</select>
<select id="selectInvestmentByList" resultType="com.cool.store.entity.ShopInfoDO">
select line_id as LineId,
investment_manager as InvestmentManager
investment_manager as investmentManager,
development_manager as developmentManager
from xfsg_shop_info
where line_id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">