Commit Graph

4056 Commits

Author SHA1 Message Date
shuo.wang
53ed63596e mini加接口 2025-06-12 16:09:10 +08:00
shuo.wang
72d6167104 加盟费待办增加职位阶段展示对账中 2025-06-12 10:48:33 +08:00
苏竹红
31e09c0e3f Merge branch 'cc_20250609_takeoutBuild' into 'master'
Cc 20250609 takeout build

See merge request hangzhou/java/custom_zxjp!113
2025-06-11 10:29:48 +00:00
苏竹红
cb3a23aaf9 Merge branch 'cc_20250611_fix' into 'master'
Cc 20250611 fix

See merge request hangzhou/java/custom_zxjp!112
2025-06-11 09:38:08 +00:00
shuo.wang
c8337c4f2c fix 2025-06-11 17:22:55 +08:00
苏竹红
3d518399f7 Merge branch 'cc_20250529_franchise_fee' into 'master'
feat:fix bug修复

See merge request hangzhou/java/custom_zxjp!111
2025-06-11 07:11:50 +00:00
苏竹红
538b08040c feat:fix bug修复 2025-06-11 15:04:11 +08:00
shuo.wang
54ab03b930 fix 2025-06-11 13:18:26 +08:00
shuo.wang
59c621bbc9 fix 2025-06-11 11:11:45 +08:00
shuo.wang
541eac1799 fix 2025-06-11 11:01:23 +08:00
shuo.wang
ffd502c6f0 fix 2025-06-11 10:16:46 +08:00
shuo.wang
c2142f7d51 筛选store表有效的门店 2025-06-11 10:04:33 +08:00
shuo.wang
a40bcbc5e5 fix 2025-06-11 09:42:19 +08:00
苏竹红
1bcaf34f19 Merge branch 'cc_20250605_shopReport' into 'master'
Cc 20250605 shop report

See merge request hangzhou/java/custom_zxjp!110
2025-06-10 09:30:02 +00:00
shuo.wang
eaf2db93ff fix 2025-06-10 16:41:51 +08:00
shuo.wang
690b4b15f1 fix 2025-06-10 16:03:48 +08:00
shuo.wang
a4643291f6 fix加盟费缴费信息时间问题 2025-06-10 16:01:50 +08:00
shuo.wang
b2b694fd46 Merge branch 'master' into cc_20250609_takeoutBuild
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
2025-06-10 15:44:00 +08:00
shuo.wang
3fe7d80d8f Merge branch 'master' into cc_20250605_shopReport 2025-06-10 15:42:39 +08:00
shuo.wang
e4fe4368fd 修改结算人信息接口 2025-06-10 14:02:58 +08:00
苏竹红
7d28b7f739 Merge branch 'cc_20250529_franchise_fee' into 'master'
Cc 20250529 franchise fee

See merge request hangzhou/java/custom_zxjp!109
2025-06-09 08:30:02 +00:00
苏竹红
df1ed1cf63 Merge branch 'cc_20250606_store_extend' into 'master'
Cc 20250606 store extend

See merge request hangzhou/java/custom_zxjp!108
2025-06-09 08:28:59 +00:00
shuo.wang
f9c79eaf0c fix导出 2025-06-09 16:19:11 +08:00
shuo.wang
171f3ca08b 建店资料同步平台建店 2025-06-09 15:39:05 +08:00
shuo.wang
aa789e1e93 fix 2025-06-09 14:30:02 +08:00
shuo.wang
b195adca33 Merge remote-tracking branch 'origin/cc_20250529_franchise_fee' into cc_20250529_franchise_fee 2025-06-09 13:49:55 +08:00
苏竹红
09d6fcc6d8 feat:franchiseFeeDataHandler 2025-06-09 13:37:47 +08:00
shuo.wang
248d6c8367 优化数据处理接口 2025-06-09 13:26:28 +08:00
shuo.wang
7d88be8a1d 导出接口 2025-06-09 10:28:56 +08:00
苏竹红
06fc2affdc feat:门店数据 2025-06-06 18:29:42 +08:00
shuo.wang
ba796a1d08 fix 2025-06-06 17:57:34 +08:00
shuo.wang
1eb42edb88 fix 2025-06-06 13:52:03 +08:00
shuo.wang
d71dfb05c5 //审批拒绝阶段 数据处理 2025-06-06 11:34:09 +08:00
shuo.wang
d6051898c0 fix 2025-06-06 10:59:29 +08:00
苏竹红
1c8c5085d5 feat:门店数据 2025-06-06 10:55:27 +08:00
shuo.wang
b90c325c1a fix 缴费金额限制 2025-06-06 10:51:58 +08:00
苏竹红
dd1bd487fc feat:门店数据 2025-06-06 10:12:13 +08:00
shuo.wang
431929338a 优化仓储找副总裁问题 2025-06-06 09:39:42 +08:00
shuo.wang
f19507e153 add 接口 2025-06-05 17:22:02 +08:00
苏竹红
b68a4ec386 feat:创建时间 2025-06-05 17:08:31 +08:00
苏竹红
423b2b921a feat:环境切换 2025-06-05 16:56:22 +08:00
shuo.wang
dd07bca48d fix 2025-06-05 15:57:10 +08:00
苏竹红
2b0035a9aa Merge remote-tracking branch 'origin/cc_20250529_franchise_fee' into cc_20250529_franchise_fee 2025-06-05 15:50:43 +08:00
苏竹红
197e833f90 feat:环境切换 2025-06-05 15:50:24 +08:00
shuo.wang
dadba55852 增加缴费金额校验 2025-06-05 15:48:23 +08:00
苏竹红
3233e773f2 feat:推送门店 2025-06-05 15:09:14 +08:00
shuo.wang
0d389a9e89 门店明细表 2025-06-05 15:07:05 +08:00
苏竹红
83843b67bc Merge remote-tracking branch 'origin/cc_20250529_franchise_fee' into cc_20250529_franchise_fee 2025-06-05 11:30:44 +08:00
苏竹红
8dad6016ec feat:加盟费 2025-06-05 11:30:28 +08:00
shuo.wang
050fe3f9d5 账单修改接口加阶段校验 2025-06-05 09:35:08 +08:00