Commit Graph

2076 Commits

Author SHA1 Message Date
shuo.wang
78fe00cac9 fix导出 2025-03-04 19:15:21 +08:00
shuo.wang
006aab6212 fix 2025-03-04 16:44:30 +08:00
shuo.wang
8b203062e9 fix 2025-03-04 16:16:38 +08:00
shuo.wang
7e14212fe7 add 字段 2025-03-03 19:30:28 +08:00
shuo.wang
2534fbc77c 导出优化 2025-03-01 18:13:56 +08:00
shuo.wang
ae2855f02a 导出优化 2025-03-01 18:03:10 +08:00
shuo.wang
ef12033705 fix 2025-03-01 17:16:53 +08:00
shuo.wang
638986f216 fix 2025-02-28 09:49:33 +08:00
shuo.wang
f919974484 fix优化导出列表 2025-02-27 17:29:01 +08:00
shuo.wang
c0532dd18a 合同签约增加字段+优化导出列表 2025-02-27 14:44:52 +08:00
shuo.wang
dc448aebbf fix 2025-02-27 14:19:02 +08:00
shuo.wang
46c6243fd0 fix 2025-02-27 13:59:05 +08:00
shuo.wang
ba681546f8 fix 2025-02-26 17:51:56 +08:00
shuo.wang
52eff54e01 Merge remote-tracking branch 'origin/cc_20250211_v2.6' into cc_20250211_v2.6 2025-02-26 17:51:37 +08:00
苏竹红
4716ab6625 fix:登录调整 2025-02-26 17:10:47 +08:00
shuo.wang
490b06946c Merge branch 'master' into cc_20250211_v2.6
# Conflicts:
#	coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
2025-02-26 16:33:58 +08:00
shuo.wang
6aa06355df fix 导出 2025-02-25 16:24:14 +08:00
shuo.wang
1af383917d fix 2025-02-25 16:16:38 +08:00
shuo.wang
6ff9e1f671 fix 2025-02-25 15:41:11 +08:00
shuo.wang
74fa4a0fd1 fix 2025-02-25 15:31:42 +08:00
shuo.wang
d76fa00923 fix 选址专员null的情况 2025-02-25 15:17:45 +08:00
shuo.wang
99536ae602 fix 选址专员null的情况 2025-02-25 15:07:34 +08:00
shuo.wang
778a87403f 导出优化 2025-02-24 18:42:51 +08:00
shuo.wang
a064b1b08e 导出优化 2025-02-24 18:36:09 +08:00
shuo.wang
a5caca6134 工作通知调整 2025-02-24 18:06:16 +08:00
shuo.wang
7689e2c02b 工作台加盟费处理人调整 2025-02-24 17:51:43 +08:00
shuo.wang
290ced1b8a 租赁合同审核放开人员限制 2025-02-24 17:47:28 +08:00
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
eebefdbe79 fix 2025-02-21 15:55:43 +08:00
shuo.wang
ae8183423b 完善进度管理列的字段 2025-02-21 14:42:57 +08:00
shuo.wang
d10a04180b fix 短信发送通知找不到人 null 的情况 2025-02-21 10:25:35 +08:00
shuo.wang
9777d8ecf5 add 铺位,选址相关的工作通知 2025-02-20 10:25:01 +08:00
shuo.wang
00ab8198eb fix bug null 2025-02-19 18:11:46 +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
苏竹红
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
c5131f43d3 fix 铺位提交审核没有审批人情况 2025-02-19 15:09:04 +08:00
shuo.wang
12b6cbb38d Merge branch 'master' into cc_20250211_v2.6 2025-02-19 13:44:17 +08:00
苏竹红
87df6d4efa Merge branch 'master' into cc_20250218_V2.5.1 2025-02-19 09:37:44 +08:00