王晓鹏
|
eb10db5baa
|
Merge branch 'cc_20241125_fix_addoperationLog' into 'master'
Cc 20241125 fix addoperation log
See merge request hangzhou/java/custom_zxjp!31
|
2024-11-25 11:05:26 +00:00 |
|
shuo.wang
|
23613d7a30
|
fix 审批人不是审批流中的人bug
|
2024-11-25 18:30:17 +08:00 |
|
shuo.wang
|
f88596e627
|
fix 审批人不是审批流中的人bug
|
2024-11-25 18:17:35 +08:00 |
|
shuo.wang
|
e41864fb8b
|
fix 审批人不是审批流中的人bug
|
2024-11-25 18:08:12 +08:00 |
|
shuo.wang
|
eb4824a6ed
|
fix 审批人不是审批流中的人bug
|
2024-11-25 17:58:51 +08:00 |
|
苏竹红
|
9b8f544514
|
Merge branch 'cc_20241119_optimize' into 'master'
Cc 20241119 optimize
See merge request hangzhou/java/custom_zxjp!30
|
2024-11-20 02:37:52 +00:00 |
|
shuo.wang
|
0bf59881df
|
fix
|
2024-11-20 10:22:14 +08:00 |
|
shuo.wang
|
03c93e98f5
|
fix
|
2024-11-20 10:17:02 +08:00 |
|
苏竹红
|
f7b71b7da1
|
Merge branch 'cc_20241119_optimize' into 'master'
Cc 20241119 optimize
See merge request hangzhou/java/custom_zxjp!29
|
2024-11-19 10:26:15 +00:00 |
|
shuo.wang
|
9225ca130e
|
fix
|
2024-11-19 18:18:31 +08:00 |
|
shuo.wang
|
bb3e8199fe
|
fix
|
2024-11-19 18:01:11 +08:00 |
|
shuo.wang
|
7f6c3b314d
|
fix
|
2024-11-19 17:48:57 +08:00 |
|
shuo.wang
|
bd86db4bf3
|
fix
|
2024-11-19 10:38:39 +08:00 |
|
苏竹红
|
38f3dfc29b
|
Merge branch 'cc_20241118_fix_submitPay' into 'master'
Cc 20241118 fix submit pay
See merge request hangzhou/java/custom_zxjp!28
|
2024-11-18 09:59:04 +00:00 |
|
shuo.wang
|
1fc63b7936
|
修改手机号，登录手机号和线索手机号一直
|
2024-11-18 15:48:31 +08:00 |
|
shuo.wang
|
7f2fd018e4
|
食安二证合一
|
2024-11-18 15:28:06 +08:00 |
|
shuo.wang
|
081ae420df
|
fix 缴纳意向金
|
2024-11-18 14:37:12 +08:00 |
|
shuo.wang
|
14ad2a7da7
|
fix 缴纳意向金
|
2024-11-18 14:34:29 +08:00 |
|
shuo.wang
|
f2bcba36f7
|
测试·小摊许可证解析
|
2024-11-18 14:14:20 +08:00 |
|
王晓鹏
|
b41fa862b5
|
Merge branch 'cc_20241112_addUpdateShopRegionId' into 'master'
Cc 20241112 add update shop region
See merge request hangzhou/java/custom_zxjp!27
|
2024-11-14 11:15:37 +00:00 |
|
shuo.wang
|
486d33323f
|
fix 筹备列表 开店时间错误，导出也是
|
2024-11-14 19:06:18 +08:00 |
|
shuo.wang
|
9e1e02aac1
|
fix 筹备列表 开店时间错误，导出也是
|
2024-11-14 11:41:48 +08:00 |
|
shuo.wang
|
3e35884669
|
fix 导出字段错误
|
2024-11-14 10:22:15 +08:00 |
|
shuo.wang
|
834e9a16e6
|
fix 增加修改门店区域
|
2024-11-13 17:41:16 +08:00 |
|
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 |
|