苏竹红
|
082e044b5a
|
Merge branch 'master' into cc_20251112_wallet
|
2025-11-19 16:45:05 +08:00 |
|
苏竹红
|
2335ecca4c
|
feat:storeId
|
2025-11-19 14:56:52 +08:00 |
|
苏竹红
|
2d6d2693c1
|
feat:is_delete
|
2025-11-17 10:43:47 +08:00 |
|
wangff
|
9256332d11
|
Merge branch 'refs/heads/master' into cc_20251112_wallet
# Conflicts:
# coolstore-partner-web/src/main/resources/application-ab.properties
# coolstore-partner-web/src/main/resources/application-test.properties
|
2025-11-14 13:13:52 +08:00 |
|
wangff
|
e6e57d6304
|
fix:新建shop门店新增storeId,建店携带storeId
|
2025-11-12 18:39:52 +08:00 |
|
苏竹红
|
6cb4086783
|
feat:证照同步异常处理
|
2025-11-12 13:19:30 +08:00 |
|
shuo.wang
|
fe13e9edfa
|
装修调整
|
2025-08-06 19:20:13 +08:00 |
|
shuo.wang
|
45cfc30e0c
|
fix
|
2025-08-06 10:10:39 +08:00 |
|
shuo.wang
|
eb9d469833
|
红圈通接口改造hqtShopId
|
2025-08-06 09:25:23 +08:00 |
|
shuo.wang
|
9bb391559c
|
红圈通接口 加校验
|
2025-08-04 10:47:00 +08:00 |
|
shuo.wang
|
fbae407c00
|
装修接口
|
2025-07-23 17:02:14 +08:00 |
|
shuo.wang
|
9321beefa3
|
fix
|
2025-07-17 19:38:11 +08:00 |
|
shuo.wang
|
e8805ee6bc
|
数据处理
|
2025-07-15 15:37:20 +08:00 |
|
shuo.wang
|
2b0c1a6404
|
数据处理代码+同步加盟商
|
2025-07-14 10:09:16 +08:00 |
|
shuo.wang
|
5a0dd61af8
|
fix
|
2025-07-11 15:10:23 +08:00 |
|
shuo.wang
|
3d003afc9c
|
增加字段 所属管理区域
|
2025-07-11 13:20:50 +08:00 |
|
shuo.wang
|
d257c19496
|
创建门店
|
2025-07-11 10:39:59 +08:00 |
|
shuo.wang
|
c71b52bbfb
|
装修验收代码
|
2025-07-01 18:44:54 +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
|
aa789e1e93
|
fix
|
2025-06-09 14:30:02 +08:00 |
|
shuo.wang
|
0d389a9e89
|
门店明细表
|
2025-06-05 15:07:05 +08:00 |
|
shuo.wang
|
521041447e
|
数据处理
|
2025-05-28 15:32:23 +08:00 |
|
shuo.wang
|
bd3fa05bf2
|
统计报表接口,数据梳理接口
|
2025-05-15 17:58:06 +08:00 |
|
shuo.wang
|
f09b89b5fe
|
报表列表接口
|
2025-05-14 14:20:27 +08:00 |
|
shuo.wang
|
176e403813
|
加盟报表代码
|
2025-05-13 17:00:13 +08:00 |
|
苏竹红
|
f04977cc7e
|
Merge branch 'cc_20250509_import_data' into 'master'
Cc 20250509 import data
See merge request hangzhou/java/custom_zxjp!74
|
2025-05-12 11:28:30 +00:00 |
|
shuo.wang
|
3564fb1bfb
|
fix
|
2025-05-12 18:32:38 +08:00 |
|
苏竹红
|
b15c9eed79
|
feat:askbot 门店获取方式变更
|
2025-05-12 10:38:19 +08:00 |
|
shuo.wang
|
11c597a8f0
|
feat:签约合同优化 + 数据处理
|
2025-05-08 15:32:40 +08:00 |
|
shuo.wang
|
77c41d0990
|
feat:签约合同优化
|
2025-05-08 13:32:20 +08:00 |
|
shuo.wang
|
6dd365a065
|
feat:签约合同优化
|
2025-05-08 11:16:40 +08:00 |
|
shuo.wang
|
c5bcfee942
|
fix 开店管理增加合同签约,门店编码trim 修复导出字段没值
|
2025-05-06 17:18:54 +08:00 |
|
shuo.wang
|
bd80c5477f
|
feat:密码数据处理,验签排除空字符串,导出接口
|
2025-04-28 22:24:49 +08:00 |
|
shuo.wang
|
574e0662e1
|
加盟合同优化
|
2025-04-22 11:45:12 +08:00 |
|
shuo.wang
|
80500fd6a6
|
建店阶段审批流
|
2025-04-17 16:36:42 +08:00 |
|
苏竹红
|
a905e2be3b
|
feat:OSS切换
|
2025-04-16 11:50:24 +08:00 |
|
shuo.wang
|
c8fa77699d
|
老店
|
2025-04-12 20:20:36 +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
|
50688f04c8
|
fix
|
2025-04-10 16:09:14 +08:00 |
|
苏竹红
|
4469c44ebb
|
Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select
|
2025-04-08 15:23:26 +08:00 |
|
苏竹红
|
c08905399c
|
feat:平台账号
|
2025-04-08 15:22:47 +08:00 |
|
shuo.wang
|
26d11b7d17
|
增加字段 同步数据组合
|
2025-04-07 19:37:12 +08:00 |
|
shuo.wang
|
7465932495
|
fix 记账本定时任务
|
2025-04-07 11:22:14 +08:00 |
|
shuo.wang
|
5e1a69a03b
|
add 字段
|
2025-04-06 14:38:14 +08:00 |
|
shuo.wang
|
944695ab31
|
铺位,选址改造
|
2025-04-03 14:11:53 +08:00 |
|
shuo.wang
|
f6fc1c133a
|
Merge branch 'master' into cc_20250327_tallyBook
# Conflicts:
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
|
2025-04-01 18:50:27 +08:00 |
|
shuo.wang
|
00a57cc6e6
|
获取状态为完成的门店列表接口+记账本定时任务
|
2025-03-31 17:36:10 +08:00 |
|
shuo.wang
|
1d82a08d37
|
fix
|
2025-03-24 16:08:21 +08:00 |
|