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 |
|
苏竹红
|
d54537937a
|
feat:云流水
|
2025-04-17 16:02:12 +08:00 |
|
苏竹红
|
6fb703d624
|
feat:云流水
|
2025-04-16 15:08:23 +08:00 |
|
shuo.wang
|
2d758f13ed
|
fix
|
2025-04-16 13:11:57 +08:00 |
|
shuo.wang
|
8564e70e13
|
mini设计阶段确认加校验
|
2025-04-14 16:29:43 +08:00 |
|
shuo.wang
|
3dbe3c227f
|
fix
|
2025-04-12 22:42:19 +08:00 |
|
苏竹红
|
92a212b836
|
Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select
# Conflicts:
# coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java
# coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java
|
2025-04-11 10:29:06 +08:00 |
|
苏竹红
|
080019ac0d
|
feat:平台账号
|
2025-04-10 20:29:57 +08:00 |
|
shuo.wang
|
9c5896fc0a
|
加必填校验
|
2025-04-10 17:36:03 +08:00 |
|
shuo.wang
|
2c55423f65
|
fix
|
2025-04-10 16:15:33 +08:00 |
|
shuo.wang
|
616c8b15f4
|
Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select
|
2025-04-09 16:56:50 +08:00 |
|
shuo.wang
|
b329c10432
|
fix
|
2025-04-09 16:56:11 +08:00 |
|
苏竹红
|
abc7c206c4
|
feat:平台账号
|
2025-04-09 10:04:35 +08:00 |
|
shuo.wang
|
d82f99533b
|
改造平台建店接口
|
2025-04-08 20:39:17 +08:00 |
|
shuo.wang
|
80b5afe47f
|
fix + 枚举，仓库数据等
|
2025-04-08 16:38:30 +08:00 |
|
苏竹红
|
4469c44ebb
|
Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select
|
2025-04-08 15:23:26 +08:00 |
|