Commit Graph

3200 Commits

Author SHA1 Message Date
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
shuo.wang
71db4d6e6e Merge branch 'master' into cc_20250211_v2.6
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
2025-02-14 16:18:00 +08:00
shuo.wang
212a1b6c1c add 企微通知 2025-02-14 16:16:05 +08:00
shuo.wang
1d088e41fb fix 查询加盟费 2025-02-14 14:24:14 +08:00
shuo.wang
1dd385513c fix 门店状态已完成 2025-02-13 20:57:01 +08:00
shuo.wang
9f61a428c1 Merge branch 'master' into cc20250207_optimize_v2.5
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java
2025-02-13 20:56:27 +08:00
苏竹红
0a8951dab4 Merge branch 'cc_20250106_v2.4' into 'master'
fix 门店状态已完成

See merge request hangzhou/java/custom_zxjp!43
2025-02-13 12:23:52 +00:00
shuo.wang
f1e49fab7a fix 门店状态已完成 2025-02-13 20:22:56 +08:00
shuo.wang
e76e09b18b fix 门店状态已完成 2025-02-13 20:16:05 +08:00
苏竹红
b121088683 Merge branch 'cc_20250106_v2.4' into 'master'
fix 门店状态已完成

See merge request hangzhou/java/custom_zxjp!42
2025-02-13 12:02:35 +00:00
shuo.wang
ac01c4009f fix 门店状态已完成 2025-02-13 20:00:31 +08:00
苏竹红
e3e955da07 Merge branch 'cc_20250106_v2.4' into 'master'
fix 门店状态已完成

See merge request hangzhou/java/custom_zxjp!41
2025-02-13 11:50:28 +00:00
shuo.wang
7377435498 fix 门店状态已完成 2025-02-13 19:47:20 +08:00
苏竹红
d2b919ef28 Merge branch 'cc_20250106_v2.4' into 'master'
Cc 20250106 v2.4

See merge request hangzhou/java/custom_zxjp!40
2025-02-13 10:44:20 +00:00
shuo.wang
7501e0e5f3 fix 开店管理导出 2025-02-13 18:40:41 +08:00
shuo.wang
e782a9044f fix 开店管理导出 2025-02-13 18:29:24 +08:00
shuo.wang
105e6febb9 fix 企微跳转链接 2025-02-13 17:23:04 +08:00
shuo.wang
bfd3f908e2 fix 企微跳转链接 2025-02-13 17:19:06 +08:00
shuo.wang
38e6b19fe2 fix 企微跳转链接 2025-02-13 17:10:01 +08:00
苏竹红
8f7d4e4963 Merge branch 'cc_20250106_v2.4' into 'master'
Cc 20250106 v2.4

See merge request hangzhou/java/custom_zxjp!39
2025-02-13 09:04:01 +00:00
shuo.wang
abfad1f11d fix addBranchShop 2025-02-12 18:45:37 +08:00
shuo.wang
233d44e57b 测试企微通知 2025-02-11 19:07:15 +08:00
shuo.wang
8aa877efa5 测试企微通知 2025-02-11 18:41:19 +08:00
shuo.wang
1aa08b1b2d 测试企微通知 2025-02-11 18:09:20 +08:00
shuo.wang
880d074546 测试企微通知 2025-02-11 16:44:02 +08:00
shuo.wang
ca23967be2 测试企微通知 2025-02-11 16:31:50 +08:00
shuo.wang
8b485f1840 加盟费付款增加字段,发票回传增加字段 2025-02-11 15:33:07 +08:00
shuo.wang
8208524632 Merge remote-tracking branch 'origin/cc20250207_optimize_v2.5' into cc20250207_optimize_v2.5 2025-02-11 14:48:13 +08:00
shuo.wang
294b547385 v2.5拆分第一年度管理费字段 2025-02-11 14:47:55 +08:00
shuo.wang
ba1d1758f6 fix getTeamPartnerList 2025-02-10 17:24:19 +08:00
shuo.wang
07bd9630a7 fix payFranchiseFeesPendingList 2025-02-10 17:16:19 +08:00
shuo.wang
d1409def5b fix payFranchiseFeesPendingList 2025-02-10 17:07:14 +08:00
shuo.wang
4215b40e72 fix 新建分店名称 2025-02-10 16:45:47 +08:00
shuo.wang
4a56a29b4c 优化:开店管理导出 2025-02-10 15:49:09 +08:00
shuo.wang
5485835abf 优化:开店管理导出 2025-02-10 15:08:25 +08:00
shuo.wang
f3af0c7704 工作台待办缴纳加盟费分配给分部内勤 2025-02-10 14:01:29 +08:00
shuo.wang
f16678104b fix 展示全部招商专员 2025-02-07 18:08:21 +08:00
shuo.wang
a3a2535239 fix 展示全部招商专员 2025-02-07 18:05:44 +08:00
shuo.wang
8b7b15aea1 fix 展示全部招商专员 2025-02-07 18:00:04 +08:00
shuo.wang
e919ed18ea v2.5 2025-02-07 17:41:37 +08:00
shuo.wang
279ab0e0d4 开店管理导出加字段 2025-02-07 14:40:11 +08:00
shuo.wang
c87a934bde 开店管理导出加字段 2025-02-07 10:51:38 +08:00
shuo.wang
a109c20c34 fix pointRecommendLine 优化代码 2025-02-06 10:17:36 +08:00
苏竹红
78af1e29d5 fix:铺位推送bug 2025-02-06 10:02:38 +08:00
shuo.wang
172572106b fix updateShopStatus 2025-01-23 15:45:27 +08:00
shuo.wang
a3b3a835e0 fix 计划开业时间 2025-01-23 14:43:30 +08:00
苏竹红
ca3303d898 feat:shopId 2025-01-22 15:53:56 +08:00
苏竹红
492f2999ee feat:addBranchShop 2025-01-22 14:04:57 +08:00