Commit Graph

2966 Commits

Author SHA1 Message Date
shuo.wang
0c7ece5410 fix 增加修改门店区域 2024-11-13 14:11:12 +08:00
shuo.wang
6eda5bdba4 fix 增加修改门店区域 2024-11-12 18:08:24 +08:00
苏竹红
a483ac86ad Merge branch 'cc_20241008_sysBuildAndAdjust' into 'master'
Cc 20241008 sys build and adjust

See merge request hangzhou/java/custom_zxjp!25
2024-11-07 13:21:28 +00:00
shuo.wang
eb565b2974 fix 修改意向金 删除缓存 2024-11-07 20:55:58 +08:00
shuo.wang
e91a9dc08e fix 修改意向金 2024-11-07 20:37:48 +08:00
苏竹红
d36d9f2017 Merge branch 'cc_20241008_sysBuildAndAdjust' into 'master'
fix 提交意向申请,修改线索阶段

See merge request hangzhou/java/custom_zxjp!24
2024-11-07 11:53:47 +00:00
shuo.wang
3f35f7f5ed fix 提交意向申请,修改线上阶段 2024-11-07 19:52:54 +08:00
shuo.wang
f727ff2ed1 fix 提交意向申请,修改线上阶段 2024-11-07 19:44:42 +08:00
苏竹红
780824176e Merge branch 'cc_20241008_sysBuildAndAdjust' into 'master'
Cc 20241008 sys build and adjust

See merge request hangzhou/java/custom_zxjp!23
2024-11-07 11:25:06 +00:00
shuo.wang
2dd3e34d19 Merge branch 'refs/heads/master' into cc_20241008_sysBuildAndAdjust
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java
2024-11-07 19:24:49 +08:00
shuo.wang
fa3a07de38 Merge branch 'refs/heads/master' into cc_20241008_sysBuildAndAdjust
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/http/WechatRest.java
2024-11-07 19:23:28 +08:00
shuo.wang
9740b2757f fix 快手账号提交 2024-11-07 16:02:08 +08:00
shuo.wang
1691922dd3 fix 工作台字段 2024-11-07 15:36:14 +08:00
shuo.wang
b3d43ed041 fix 工作台字段 2024-11-07 15:31:49 +08:00
shuo.wang
ab784594a9 fix 导出任务名称 2024-11-07 14:59:17 +08:00
shuo.wang
fcc97093c5 fix 导出任务名称 2024-11-07 10:17:21 +08:00
shuo.wang
df828e66bb fix 导出任务名称 2024-11-06 16:07:04 +08:00
shuo.wang
929316d80a fix 列表根据区域筛选,查看子集 2024-11-06 15:10:11 +08:00
shuo.wang
a06400a21e fix 获取店铺列表/getShopList 增加pointId 2024-11-06 14:07:16 +08:00
shuo.wang
8483434fe3 fix 导出字段 2024-11-06 11:27:23 +08:00
shuo.wang
78b1f0a71e fix 导出字段 2024-11-06 11:23:08 +08:00
shuo.wang
468ba1d31d fix 导出数量限制十万 2024-11-06 10:17:37 +08:00
shuo.wang
00c084f1e5 fix 2024-11-05 19:58:57 +08:00
shuo.wang
ac5f360791 fix 2024-11-05 19:04:52 +08:00
shuo.wang
265e993e7e fix 列表可见范围 2024-11-05 18:32:23 +08:00
shuo.wang
52af6ba903 多品牌使用 2024-11-05 18:23:00 +08:00
shuo.wang
ad906eadca 多品牌使用 2024-11-05 13:44:01 +08:00
shuo.wang
f71d969744 多品牌使用 2024-11-04 20:50:20 +08:00
shuo.wang
729d554a79 多品牌使用 2024-11-04 20:42:50 +08:00
shuo.wang
f97f2f66dd 多品牌使用 2024-11-04 20:26:32 +08:00
shuo.wang
31e6e8a1a2 多品牌使用 2024-11-04 19:55:55 +08:00
王晓鹏
2e0a655ad2 Merge branch 'cc_2024_1104_fix_addOperationLog' into 'master'
cc_2024_1104_fix_addOperationLog

See merge request hangzhou/java/custom_zxjp!22
2024-11-04 11:10:40 +00:00
shuo.wang
66736b23c7 cc_2024_1104_fix_addOperationLog 2024-11-04 15:18:43 +08:00
shuo.wang
d728c91628 处理多品牌 2024-11-04 15:16:43 +08:00
王晓鹏
bfcae3f27f Merge branch 'cc_20241101_fix_wx_getUserPhone' into 'master'
fix 微信getUserPhoneNumber

See merge request hangzhou/java/custom_zxjp!21
2024-11-01 10:21:12 +00:00
shuo.wang
c29f1aa1a2 fix 微信getUserPhoneNumber 2024-11-01 18:20:37 +08:00
shuo.wang
9b6f73e615 fix 微信getUserPhoneNumber 2024-11-01 18:19:54 +08:00
王晓鹏
2587bf4584 Merge branch 'cc_20241101_fix_wx_getUserPhone' into 'master'
fix 微信getUserPhoneNumber

See merge request hangzhou/java/custom_zxjp!20
2024-11-01 10:17:05 +00:00
shuo.wang
f3f69a845c fix 微信getUserPhoneNumber 2024-11-01 18:12:16 +08:00
shuo.wang
740d0a60e3 fix合同签约增加修改 2024-11-01 17:38:20 +08:00
shuo.wang
1fd6e1f005 意向金 加盟费 合同签约增加修改+fix 获取 wx token 2024-11-01 15:35:40 +08:00
shuo.wang
7cc854b59c 意向金 加盟费 合同签约增加修改 2024-10-31 17:08:10 +08:00
shuo.wang
88381ccb8f fix updateShopCode接口增加修改门店name功能 2024-10-30 17:05:19 +08:00
shuo.wang
b388e80ef1 fix 待办增加字段 2024-10-30 15:41:03 +08:00
shuo.wang
5425f73338 fix 2024-10-30 14:46:15 +08:00
shuo.wang
7e95ee0b5c fix getLinePayInfo 2024-10-30 14:22:10 +08:00
shuo.wang
d900e0df03 add 接口跳过营帐通,add 平台建店字段 2024-10-30 10:52:41 +08:00
苏竹红
81dfe87801 Merge branch 'cc_20241008_sysBuildAndAdjust' into 'master'
Cc 20241008 sys build and adjust

See merge request hangzhou/java/custom_zxjp!19
2024-10-14 09:35:28 +00:00
shuo.wang
0b4dbd4717 fix 2024-10-14 15:23:07 +08:00
shuo.wang
967d2c166a fix 2024-10-14 14:28:58 +08:00