王非凡
e34aea7a40
Merge #19 into master from cc_20251223_orgChange
组织架构迁移
* cc_20251223_orgChange: (32 commits squashed)
- fix:角色枚举值变更
- fix:待办-缴纳加盟费/保证金中，删除企微督导查询权限，督导查询权限改为招商经理；待办-建店资料中，删除企微督导查询权限
- fix:开店管理-查询我负责的招商经理或运营顾问为当前用户的；查询我管辖的如果当前用户是招商经理则查招商区域
- feat:组织架构切换调整
- Merge remote-tracking branch 'origin/cc_20251223_orgChange' into cc_20251223_orgChange
- feat:门店详情新增招商所属大区 运营顾问
- fix:获取可选择的大区新增type字段
- Merge remote-tracking branch 'origin/cc_20251223_orgChange' into cc_20251223_orgChange
- feat:修改招商所属大区
- Merge remote-tracking branch 'origin/cc_20251223_orgChange' into cc_20251223_orgChange
- feat:新增分店 修改分店
- feat:operations_consultant
- fix:获取平台建店左侧小窗详情接口新增招商区域名称字段
- feat:合同开始之后需要分配才能触发后续阶段
- Merge remote-tracking branch 'origin/cc_20251223_orgChange' into cc_20251223_orgChange
- fix:新增招商区域名称字段
- Merge remote-tracking branch 'origin/cc_20251223_orgChange' into cc_20251223_orgChange
- fix:大区查询添加enableFlag字段
- Merge remote-tracking branch 'origin/cc_20251223_orgChange' into cc_20251223_orgChange
- fix:代办查询bug修改
- fix:字段缺失补充
- Merge branch 'master' into cc_20251223_orgChange
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java
- fix:修改基本资料bug
- fix:线索列表接口新增招商所属区域名称字段
- fix:加盟商资质审核通过自动建店时带出招商所属区域
- fix:补充提交
- fix:修改开店详情接口修改招商所属区域
- fix:工作台待办返回招商区域名称字段
- fix:开店详情接口招商所属区域id为0的数据返回null
- fix:字段补充
- fix:招商所属大区字段补充
- fix:字段补充
Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/19
2025-12-31 06:56:47 +00:00
..
2025-11-05 10:26:56 +08:00
2025-11-05 15:40:31 +08:00
2025-12-04 09:48:08 +00:00
2025-09-23 14:01:48 +08:00
2025-11-20 14:31:12 +08:00
2025-12-09 08:55:37 +00:00
2025-07-25 14:07:20 +08:00
2025-06-04 17:40:43 +08:00
2024-05-11 19:37:47 +08:00
2024-05-07 14:06:43 +08:00
2024-04-29 17:25:09 +08:00
2024-03-28 16:38:27 +08:00
2025-04-21 16:13:21 +08:00
2025-12-31 06:56:47 +00:00
2025-06-11 11:01:23 +08:00
2025-12-09 08:55:47 +00:00
2025-12-09 08:55:47 +00:00
2025-12-09 08:55:47 +00:00
2025-12-09 08:55:47 +00:00
2025-12-09 08:55:47 +00:00
2025-12-09 08:55:47 +00:00
2025-12-09 08:55:47 +00:00
2025-09-09 11:09:57 +08:00
2025-07-24 15:24:32 +08:00
2025-07-25 10:40:44 +08:00
2024-06-04 18:13:21 +08:00
2025-07-25 17:12:06 +08:00
2025-10-27 17:01:35 +08:00
2024-03-08 13:48:10 +08:00
2025-04-08 16:38:30 +08:00
2024-05-10 09:58:31 +08:00
2025-06-09 13:26:28 +08:00
2025-04-08 14:23:19 +08:00
2025-04-08 14:23:19 +08:00
2025-06-23 18:37:56 +08:00
2025-01-14 19:03:29 +08:00
2024-03-25 09:55:22 +08:00
2024-03-25 09:55:22 +08:00
2024-03-20 20:47:11 +08:00
2025-10-16 16:31:45 +08:00
2024-11-05 18:23:00 +08:00
2024-07-17 15:29:24 +08:00
2025-02-11 15:33:07 +08:00
2024-04-02 16:49:06 +08:00
2024-04-09 20:06:54 +08:00
2024-05-24 21:41:16 +08:00
2025-01-08 14:19:07 +08:00
2025-12-31 06:56:47 +00:00
2024-05-21 11:17:23 +08:00
2025-08-20 14:25:57 +08:00
2025-07-24 17:28:42 +08:00
2025-09-05 13:39:29 +08:00
2024-04-22 13:51:17 +08:00
2025-04-12 18:52:03 +08:00
2024-05-11 16:10:57 +08:00
2025-12-25 10:50:38 +00:00
2025-03-24 15:01:45 +08:00
2024-05-15 15:54:19 +08:00
2025-06-27 16:44:44 +08:00
2025-12-31 06:56:47 +00:00
2025-12-26 08:55:27 +00:00
2025-10-15 10:47:57 +08:00
2025-05-26 10:58:36 +08:00
2024-05-07 17:41:32 +08:00
2025-05-12 17:12:05 +08:00
2025-05-12 17:12:05 +08:00
2025-04-12 22:55:46 +08:00
2025-04-03 14:11:53 +08:00
2025-05-23 16:33:52 +08:00
2025-06-25 18:07:41 +08:00
2025-06-21 18:39:29 +08:00
2025-06-24 18:21:07 +08:00
2025-06-25 22:39:56 +08:00
2025-06-25 22:52:27 +08:00
2025-04-06 18:34:06 +08:00
2024-03-29 14:18:54 +08:00
2025-12-31 06:56:47 +00:00
2024-04-25 20:27:59 +08:00
2025-12-15 09:43:50 +00:00
2024-05-17 20:57:54 +08:00
2025-12-31 06:56:47 +00:00
2024-04-23 16:38:52 +08:00
2025-08-07 14:06:39 +08:00
2025-05-27 15:22:52 +08:00
2025-09-17 15:17:21 +08:00
2025-07-25 17:12:06 +08:00
2025-12-09 08:55:47 +00:00
2025-10-15 11:28:38 +08:00
2024-03-08 13:48:10 +08:00
2025-11-10 15:58:15 +08:00
2024-03-08 13:48:10 +08:00
2024-06-05 18:01:14 +08:00
2025-04-01 17:08:40 +08:00
2025-04-01 15:38:13 +08:00
2024-06-21 17:16:36 +08:00
2024-05-29 10:16:59 +08:00
2024-04-07 11:26:44 +08:00
2025-01-08 17:32:54 +08:00
2025-11-10 15:58:15 +08:00
2024-03-08 13:48:10 +08:00
2025-04-28 22:24:49 +08:00