shuo.wang
|
c014841e8c
|
加盟费改造
|
2025-05-30 18:17:57 +08:00 |
|
shuo.wang
|
20fcd02ac2
|
Merge branch 'refs/heads/master' into cc_20250529_franchise_fee
|
2025-05-30 15:14:56 +08:00 |
|
苏竹红
|
43f9475549
|
Merge branch 'master' into cc_20250529_login
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
|
2025-05-30 13:40:53 +08:00 |
|
苏竹红
|
6dfce8b0e2
|
feat:登录
|
2025-05-30 13:39:26 +08:00 |
|
shuo.wang
|
3abd8b99ef
|
加盟商结束跟进
|
2025-05-29 18:29:33 +08:00 |
|
shuo.wang
|
a9f8fd9306
|
加盟商结束跟进
|
2025-05-29 17:27:52 +08:00 |
|
shuo.wang
|
1e323efe7c
|
加盟费代码改造
|
2025-05-29 13:36:24 +08:00 |
|
shuo.wang
|
6d50469af2
|
Merge branch 'master' into cc_20250527_desk
# Conflicts:
# coolstore-partner-web/src/main/resources/application-online.properties
|
2025-05-28 20:07:48 +08:00 |
|
shuo.wang
|
0f1b40f21f
|
fix
|
2025-05-28 20:00:06 +08:00 |
|
shuo.wang
|
521041447e
|
数据处理
|
2025-05-28 15:32:23 +08:00 |
|
shuo.wang
|
011d60a4d7
|
fix
|
2025-05-28 10:26:19 +08:00 |
|
shuo.wang
|
a5ad26928c
|
数据处理代码
|
2025-05-28 10:09:40 +08:00 |
|
shuo.wang
|
9025ee6446
|
业务备注
|
2025-05-27 15:22:52 +08:00 |
|
shuo.wang
|
c8504734f3
|
Merge branch 'master' into cc_20250527_desk
# Conflicts:
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
|
2025-05-27 13:59:30 +08:00 |
|
苏竹红
|
4cf91113f3
|
Merge branch 'cc_20250523' into 'master'
批量处理云流水订货阶段接口
See merge request hangzhou/java/custom_zxjp!101
|
2025-05-27 05:56:27 +00:00 |
|
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 |
|