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

Merge branch 'master' into cc_20250513_franchise_report

Browse Source
This commit is contained in:
shuo.wang
2025-05-14 13:35:51 +08:00
parent dd3aa88833 9a9db19ff5
commit 3137d9d7f4
15 changed files with 159 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml
View File

@@ -43,6 +43,7 @@
c.line_id as lineId,
c.region_id as regionId,
c.store_type as storeType,
c.join_mode as joinMode,
b.shop_stage as stage,
b.shop_sub_stage as subStage,
b.shop_sub_stage_status as subStageStatus,

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

@@ -38,6 +38,7 @@
c.id as shopId,
c.line_id as lineId,
c.region_id as regionId,
c.join_mode as joinMode,
c.store_type as storeType,
b.shop_stage as stage,
b.shop_sub_stage as subStage,
@@ -62,6 +63,7 @@
c.line_id as lineId,
c.region_id as regionId,
c.store_type as storeType,
c.join_mode as joinMode,
b.shop_stage as stage,
b.shop_sub_stage as subStage,
b.shop_sub_stage_status as subStageStatus,
@@ -85,6 +87,7 @@
c.line_id as lineId,
c.region_id as regionId,
c.store_type as storeType,
c.join_mode as joinMode,
b.shop_stage as stage,
b.shop_sub_stage as subStage,
b.shop_sub_stage_status as subStageStatus,

4
coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml
View File

@@ -56,7 +56,9 @@
limit 1
</select>
<select id="selectByShopIds" resultType="com.cool.store.entity.SignFranchiseDO">
select contract_code,shop_id,sign_type,contract_start_time,contract_end_time,contract_amount,create_time,partnership_signatory_first,partnership_signatory_second
select contract_code,shop_id,sign_type,contract_start_time,contract_end_time,contract_amount,create_time,
partnership_signatory_first,partnership_signatory_second ,partnership_signatory_second_id_number,partnership_signatory_second_mobile,
introduction_award,introduce_store,introducer,protective_distance,partnership_signatory_first_which_store
from xfsg_sign_franchise
where 1=1
<if test="list !=null and list.size >0">