Commit Graph

3297 Commits

Author SHA1 Message Date
shuo.wang
f49159a754 测试工作通知 2025-02-24 17:02:54 +08:00
shuo.wang
557617004f fix 没有审批人增加报错信息 2025-02-24 15:59:23 +08:00
shuo.wang
0e5f20d5a2 Merge branch 'cc_20250224_fixBug' into cc_20250211_v2.6 2025-02-24 14:10:05 +08:00
shuo.wang
639a017534 fix 没有审批人增加报错信息 2025-02-24 14:05:58 +08:00
shuo.wang
c2d673f3cb Merge branch 'cc_20250224_fixBug' into cc_20250211_v2.6
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
2025-02-24 14:01:16 +08:00
shuo.wang
c97c5ab5c2 fix 选址专员全部显示 2025-02-24 13:57:19 +08:00
shuo.wang
555654e5c9 fix 小程序提交铺位区域和选址专员错误bug 2025-02-24 11:02:34 +08:00
shuo.wang
d703cbe9f6 fix 小程序提交铺位区域和选址专员错误bug 2025-02-24 09:43:56 +08:00
shuo.wang
f1e57ee772 fix null 2025-02-21 18:52:00 +08:00
shuo.wang
429559d394 fix 2025-02-21 17:21:05 +08:00
shuo.wang
10ca7a1845 fix 2025-02-21 16:28:19 +08:00
shuo.wang
be7fee6b53 fix 2025-02-21 16:03:17 +08:00
shuo.wang
eebefdbe79 fix 2025-02-21 15:55:43 +08:00
shuo.wang
ae8183423b 完善进度管理列的字段 2025-02-21 14:42:57 +08:00
shuo.wang
4f0b39820b Merge remote-tracking branch 'origin/cc_20250211_v2.6' into cc_20250211_v2.6 2025-02-21 10:26:29 +08:00
shuo.wang
d10a04180b fix 短信发送通知找不到人 null 的情况 2025-02-21 10:25:35 +08:00
苏竹红
372f93fa6a Merge remote-tracking branch 'origin/cc_20250211_v2.6' into cc_20250211_v2.6 2025-02-20 16:23:12 +08:00
苏竹红
7e14e1569c fix:登录调整 2025-02-20 16:22:59 +08:00
shuo.wang
8a43300599 fix 2025-02-20 10:38:45 +08:00
shuo.wang
6afefe4643 add 铺位,选址相关的工作通知 2025-02-20 10:30:14 +08:00
shuo.wang
9777d8ecf5 add 铺位,选址相关的工作通知 2025-02-20 10:25:01 +08:00
shuo.wang
726babf784 Merge remote-tracking branch 'origin/cc_20250211_v2.6' into cc_20250211_v2.6 2025-02-19 18:12:33 +08:00
shuo.wang
00ab8198eb fix bug null 2025-02-19 18:11:46 +08:00
苏竹红
4cfb632e49 Merge remote-tracking branch 'origin/cc_20250211_v2.6' into cc_20250211_v2.6 2025-02-19 16:26:36 +08:00
苏竹红
44861fed66 fix:登录调整 2025-02-19 16:26:22 +08:00
shuo.wang
35444f6cb9 add 运营方案审核不通过的工作通知 2025-02-19 16:22:34 +08:00
shuo.wang
88767d05a8 fix 短信通知找人出现null报错 2025-02-19 16:12:10 +08:00
苏竹红
bf0d0a80d3 fix:登录调整 2025-02-19 16:06:21 +08:00
苏竹红
72d1f5fb88 fix:登录调整 2025-02-19 16:04:37 +08:00
苏竹红
5e00fac82a fix:登录调整 2025-02-19 16:02:35 +08:00
苏竹红
82fa96b5af fix:登录调整 2025-02-19 15:58:05 +08:00
shuo.wang
eeda40bc86 fix 短信通知加盟商姓名未显示 2025-02-19 15:16:14 +08:00
shuo.wang
c5131f43d3 fix 铺位提交审核没有审批人情况 2025-02-19 15:09:04 +08:00
shuo.wang
b0749b9c29 fix 职位code 2025-02-19 13:57:02 +08:00
shuo.wang
12b6cbb38d Merge branch 'master' into cc_20250211_v2.6 2025-02-19 13:44:17 +08:00
苏竹红
dfb26f5af2 Merge branch 'cc_20250218_V2.5.1' into 'master'
Cc 20250218 v2.5.1

See merge request hangzhou/java/custom_zxjp!46
2025-02-19 04:41:29 +00:00
苏竹红
87df6d4efa Merge branch 'master' into cc_20250218_V2.5.1 2025-02-19 09:37:44 +08:00
苏竹红
bce96ebc5d Merge branch 'cc20250207_optimize_v2.5' into 'master'
Cc20250207 optimize v2.5

See merge request hangzhou/java/custom_zxjp!45
2025-02-18 11:04:57 +00:00
shuo.wang
a5dc0898ce fix 2025-02-18 18:04:07 +08:00
shuo.wang
9822bfc75c fix 2025-02-18 17:59:45 +08:00
shuo.wang
528ff2660f fix 2025-02-18 16:23:58 +08:00
shuo.wang
1c863e40f2 fix 2025-02-18 16:20:15 +08:00
shuo.wang
d59b8feb3e 增加修改加盟商姓名接口 2025-02-18 15:11:59 +08:00
shuo.wang
d1a1df62e9 fix getShopList 2025-02-18 14:05:07 +08:00
shuo.wang
a4b45e2ec2 fix getShopList 2025-02-18 13:59:16 +08:00
shuo.wang
3588919fcc Merge branch 'cc20250207_optimize_v2.5' into cc_20250211_v2.6 2025-02-17 15:32:16 +08:00
shuo.wang
50a7700fdf add 企微通知 2025-02-17 15:31:25 +08:00
shuo.wang
82d90774ab add 企微通知 2025-02-17 11:11:29 +08:00
shuo.wang
f78fddf06f add 企微通知 2025-02-17 11:04:42 +08:00
shuo.wang
5e7351fbfa add 企微通知 2025-02-14 16:19:57 +08:00