Commit Graph

1475 Commits

Author SHA1 Message Date
shuo.wang
9a58b1f2a7 Merge branch 'master' into cc_20250523
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java
2025-05-27 13:56:09 +08:00
shuo.wang
68be3ba4d1 Merge branch 'master' into cc_20250526_jingDong
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java
2025-05-27 13:51:36 +08:00
shuo.wang
e281730b84 工作台搜索 2025-05-27 13:49:30 +08:00
苏竹红
865cfdc857 Merge branch 'cc_20250526_douyin' into 'master'
Cc 20250526 douyin

See merge request hangzhou/java/custom_zxjp!99
2025-05-27 05:48:35 +00:00
苏竹红
575e927d68 Merge branch 'cc_20250520_ghostwriting' into 'master'
Cc 20250520 ghostwriting

See merge request hangzhou/java/custom_zxjp!97
2025-05-27 05:48:29 +00:00
shuo.wang
3a17363c7c fix 2025-05-26 20:50:53 +08:00
shuo.wang
7baf4804ec 京东外卖 2025-05-26 15:36:21 +08:00
shuo.wang
b3cb8178ff 抖音核销手机号 2025-05-26 10:58:36 +08:00
shuo.wang
ad7c879a78 批量处理云流水订货阶段接口 2025-05-23 16:33:52 +08:00
shuo.wang
59bc81b292 待办fix 不查询结束跟进的门店 2025-05-22 17:24:30 +08:00
shuo.wang
f1b256205e fix 2025-05-21 19:36:44 +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
苏竹红
ff6cfa7e4a feat:薪超人 2025-05-21 17:35:23 +08:00
苏竹红
2d3f1ecd82 feat:财务数据区分 2025-05-21 15:02:46 +08:00
shuo.wang
b41ecc436a 待办排序+更新时间 2025-05-21 11:23:43 +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
0909369e59 fix 2025-05-19 18:31:27 +08:00
shuo.wang
058a9bc250 fix 2025-05-19 13:55:53 +08:00
shuo.wang
3c2f97d2f6 fix 2025-05-15 19:00:55 +08:00
shuo.wang
bd3fa05bf2 统计报表接口,数据梳理接口 2025-05-15 17:58:06 +08:00
shuo.wang
f253b2a0c3 统计报表接口,数据梳理接口 2025-05-15 15:31:23 +08:00
shuo.wang
f09b89b5fe 报表列表接口 2025-05-14 14:20:27 +08:00
shuo.wang
3137d9d7f4 Merge branch 'master' into cc_20250513_franchise_report 2025-05-14 13:35:51 +08:00
shuo.wang
3ca4478c91 Merge branch 'cc_20250513_franchise_report' into cc_2250513_api 2025-05-14 10:03:04 +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
苏竹红
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
f2c9dfd389 fix 导出 2025-05-13 14:25:44 +08:00
shuo.wang
d9af75edca fix 2025-05-13 10:33:51 +08:00
苏竹红
3e8a2d272e Merge branch 'cc_20250509_import_data' into 'master'
fix

See merge request hangzhou/java/custom_zxjp!76
2025-05-12 12:27:59 +00:00
shuo.wang
9d792bf8b4 fix 2025-05-12 20:26:11 +08:00
苏竹红
1899bbc65f Merge branch 'cc_20250509_import_data' into 'master'
fix

See merge request hangzhou/java/custom_zxjp!75
2025-05-12 12:05:31 +00:00
shuo.wang
9dfd7c5fca fix 2025-05-12 20:00:40 +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
df2f7e1e07 fix 2025-05-12 19:06:08 +08:00
shuo.wang
3564fb1bfb fix 2025-05-12 18:32:38 +08:00
shuo.wang
db4c7b2bd9 老数据数据处理 2025-05-12 17:12:05 +08:00
苏竹红
b15c9eed79 feat:askbot 门店获取方式变更 2025-05-12 10:38:19 +08:00
苏竹红
9939a7c1aa feat:新管家 2025-05-09 15:10:44 +08:00
shuo.wang
f0c99d9127 feat:选址阶段 地址优化 2025-05-08 17:10:31 +08:00
shuo.wang
2c0d9c9ec6 feat:选址阶段 地址优化 2025-05-08 17:07:16 +08:00
shuo.wang
f645122919 feat:选址阶段 地址优化 2025-05-08 17:04:39 +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
83585ff95b fix 2025-05-07 17:28:56 +08:00
shuo.wang
cd3d0f2934 fix 2025-05-07 17:08:33 +08:00
shuo.wang
8462f1d41c fix 2025-05-07 17:05:56 +08:00
shuo.wang
87e0af9448 fix 2025-05-07 16:53:33 +08:00