shuo.wang
|
824a59c22b
|
Merge branch 'master' into cc_20250520_ghostwriting
# Conflicts:
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
|
2025-05-21 19:35:15 +08:00 |
|
苏竹红
|
9a5946ecf5
|
Merge branch 'cc_20250521_fix' into 'master'
Cc 20250521 fix
See merge request hangzhou/java/custom_zxjp!92
|
2025-05-21 09:47:06 +00:00 |
|
shuo.wang
|
4f068b70ac
|
缴纳加盟费检验缴费人必须是签约人
|
2025-05-21 16:38:44 +08:00 |
|
苏竹红
|
bcd2531139
|
Merge branch 'cc_2250513_api' into 'master'
Cc 2250513 api
See merge request hangzhou/java/custom_zxjp!89
|
2025-05-20 09:32:04 +00:00 |
|
shuo.wang
|
795f8efee7
|
移动端督导代写
|
2025-05-20 14:11:22 +08:00 |
|
苏竹红
|
36f2b04b17
|
Merge branch 'cc_20250516_dataHandler' into 'master'
Cc 20250516 data handler
See merge request hangzhou/java/custom_zxjp!88
|
2025-05-19 10:33:21 +00:00 |
|
苏竹红
|
8c8fd75d73
|
feat:建店品牌负责人通知
|
2025-05-19 14:26:31 +08:00 |
|
shuo.wang
|
058a9bc250
|
fix
|
2025-05-19 13:55:53 +08:00 |
|
苏竹红
|
a8993e9b60
|
Merge branch 'cc_20250513_franchise_report' into 'master'
Cc 20250513 franchise report
See merge request hangzhou/java/custom_zxjp!82
|
2025-05-15 10:14:23 +00:00 |
|
苏竹红
|
cf5af4cb77
|
feat:自有店财务
|
2025-05-15 17:05:00 +08:00 |
|
shuo.wang
|
369f93b1a2
|
Merge branch 'master' into cc_20250513_franchise_report
|
2025-05-15 16:30:12 +08:00 |
|
shuo.wang
|
f253b2a0c3
|
统计报表接口，数据梳理接口
|
2025-05-15 15:31:23 +08:00 |
|
苏竹红
|
9e324de66f
|
feat:阶段数据
|
2025-05-15 10:55:01 +08:00 |
|
shuo.wang
|
177ff32f58
|
报表列表接口
|
2025-05-14 17:33:32 +08:00 |
|
苏竹红
|
4d7efab991
|
feat:阶段数据
|
2025-05-14 15:13:22 +08:00 |
|
shuo.wang
|
3137d9d7f4
|
Merge branch 'master' into cc_20250513_franchise_report
|
2025-05-14 13:35:51 +08:00 |
|
shuo.wang
|
e1706f7cc9
|
Merge remote-tracking branch 'origin/cc_2250513_api' into cc_2250513_api
|
2025-05-14 10:03:24 +08:00 |
|
shuo.wang
|
3ca4478c91
|
Merge branch 'cc_20250513_franchise_report' into cc_2250513_api
|
2025-05-14 10:03:04 +08:00 |
|
苏竹红
|
c9b6ccdee4
|
feat:正新菜品token
|
2025-05-13 18:41:55 +08:00 |
|
shuo.wang
|
a9a7f027db
|
Merge branch 'cc_20250513' into cc_2250513_api
|
2025-05-13 18:04:49 +08:00 |
|
shuo.wang
|
7233f12a16
|
fix
|
2025-05-13 18:04:24 +08:00 |
|
shuo.wang
|
36ebeae707
|
Merge branch 'cc_20250513' into cc_2250513_api
|
2025-05-13 17:01:05 +08:00 |
|
shuo.wang
|
176e403813
|
加盟报表代码
|
2025-05-13 17:00:13 +08:00 |
|
shuo.wang
|
2bf1ddea47
|
提交建店资料加锁防止重复提交
|
2025-05-13 15:02:55 +08:00 |
|
苏竹红
|
f199b3dbd4
|
Merge branch 'master' into cc_2250513_api
|
2025-05-13 14:59:49 +08:00 |
|
苏竹红
|
81fee5d4d5
|
feat:askbot 门店获取方式变更
|
2025-05-13 14:58:36 +08:00 |
|
shuo.wang
|
1867bbbde5
|
fix
|
2025-05-13 11:54:49 +08:00 |
|
shuo.wang
|
d7a7468c89
|
fix
|
2025-05-13 11:02:19 +08:00 |
|
shuo.wang
|
2ff9e6fc2b
|
fix
|
2025-05-12 19:26:21 +08:00 |
|
shuo.wang
|
db4c7b2bd9
|
老数据数据处理
|
2025-05-12 17:12:05 +08:00 |
|
shuo.wang
|
6dd365a065
|
feat：签约合同优化
|
2025-05-08 11:16:40 +08:00 |
|
苏竹红
|
b394bdbb3a
|
Merge branch 'master' into cc_sign_20250507
|
2025-05-08 10:15:13 +08:00 |
|
苏竹红
|
c12488135a
|
feat:加盟合同阶段处理
|
2025-05-08 10:13:27 +08:00 |
|
shuo.wang
|
9e91ab28ec
|
fix
|
2025-05-07 17:01:12 +08:00 |
|
shuo.wang
|
87e0af9448
|
fix
|
2025-05-07 16:53:33 +08:00 |
|
shuo.wang
|
d64f99b568
|
fix 开店管理增加合同签约，门店编码trim 修复导出字段没值
|
2025-05-06 18:36:32 +08:00 |
|
shuo.wang
|
bbd03472d9
|
导出放开限制，测量阶段通知
|
2025-04-30 15:15:07 +08:00 |
|
shuo.wang
|
fcc86e38f0
|
导出加字段
|
2025-04-29 19:23:31 +08:00 |
|
shuo.wang
|
a1c50bfe98
|
feat:密码数据处理，验签排除空字符串，导出接口
|
2025-04-29 16:32:47 +08:00 |
|
shuo.wang
|
bd80c5477f
|
feat:密码数据处理，验签排除空字符串，导出接口
|
2025-04-28 22:24:49 +08:00 |
|
ryan.xu
|
683ffec2d7
|
feat: 测量阶段代办按照职位查询数据
|
2025-04-25 14:43:28 +08:00 |
|
ryan.xu
|
3edcd3b4a2
|
feat: 装修测量阶段+设计阶段流程优化
|
2025-04-24 09:36:12 +08:00 |
|
苏竹红
|
404afbaa2e
|
feat:bug
|
2025-04-21 22:04:28 +08:00 |
|
苏竹红
|
87b015f782
|
feat:添加银行
|
2025-04-21 16:13:21 +08:00 |
|
苏竹红
|
70340f86e8
|
feat:云流水
|
2025-04-18 01:44:23 +08:00 |
|
shuo.wang
|
a8a9239c69
|
fix
|
2025-04-17 20:09:32 +08:00 |
|
shuo.wang
|
280fb51601
|
fix
|
2025-04-17 18:38:38 +08:00 |
|
shuo.wang
|
593d4fce77
|
fix
|
2025-04-17 17:25:07 +08:00 |
|
shuo.wang
|
32a45dc2af
|
Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select
|
2025-04-17 16:37:23 +08:00 |
|
shuo.wang
|
80500fd6a6
|
建店阶段审批流
|
2025-04-17 16:36:42 +08:00 |
|