Commit Graph

78 Commits

Author SHA1 Message Date
苏竹红
3f6b6a7ac4 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-15 11:37:05 +08:00
苏竹红
4356655dfd 店员+状态码修改 2023-06-15 11:36:51 +08:00
wxp01309236
0892edc643 小程序配置 2023-06-15 11:07:20 +08:00
苏竹红
81f74c54d6 高级设置 2023-06-15 09:40:45 +08:00
苏竹红
c8914d554f 高级设置 2023-06-15 09:39:56 +08:00
苏竹红
f0f54a929e service 2023-06-14 20:00:22 +08:00
苏竹红
b75f5527b0 B端 部分接口3 2023-06-14 19:46:44 +08:00
苏竹红
990cde47b6 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-14 19:40:01 +08:00
苏竹红
c0cf731ac3 B端 部分接口3 2023-06-14 19:38:38 +08:00
zhangchenbiao
c7c4b8ff40 oss 新增cdn 2023-06-14 19:38:09 +08:00
zhangchenbiao
23be0bf864 add log 2023-06-14 17:27:31 +08:00
zhangchenbiao
7150c38a9b add log 2023-06-14 17:25:14 +08:00
zhangchenbiao
a3a4875a72 add log 2023-06-14 17:19:16 +08:00
zhangchenbiao
8877105a82 update config 2023-06-14 16:54:57 +08:00
zhangchenbiao
a643859dc2 组织架构新增定时任务 2023-06-14 16:21:55 +08:00
zhangchenbiao
4596b69e68 isv update 2023-06-14 16:04:30 +08:00
zhangchenbiao
40c99a8337 全局登录态处理 2023-06-14 15:49:52 +08:00
zhangchenbiao
601f28b31e 飞书事件变更,mq更新 2023-06-14 15:28:45 +08:00
zhangchenbiao
4f4cb5ccc3 update mq config 2023-06-14 11:06:53 +08:00
zhangchenbiao
b9cab477e9 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-14 10:45:04 +08:00
zhangchenbiao
2ed2296a82 日历对接 2023-06-14 10:44:55 +08:00
俞扬
e87356fd87 Merge branch 'cc_20230520_partner' of http://gitlab.coolcollege.cn/hangzhou/java/coolstore-partner-manage into cc_20230520_partner 2023-06-14 10:42:02 +08:00
俞扬
cc118b78fc 面试相关接口 2023-06-14 10:41:45 +08:00
苏竹红
df2f2e307d B端 部分接口2 2023-06-14 10:29:55 +08:00
pserimal
f86e7d7bff Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
2023-06-13 18:55:38 +08:00
pserimal
ee2372c8f8 动态管理修改及加盟商资格面试 2023-06-13 18:54:47 +08:00
zhangchenbiao
00c535d950 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-13 18:52:48 +08:00
zhangchenbiao
202d3ab8ba 组织架构更改 2023-06-13 18:52:39 +08:00
苏竹红
deace8ecd5 B端 部分接口 2023-06-13 15:43:27 +08:00
苏竹红
5a6cd73113 B端 部分接口 2023-06-13 09:47:07 +08:00
zhangchenbiao
a2d58d3dcc 新增组织架构相关 2023-06-12 16:42:39 +08:00
zhangchenbiao
eb9dc4116a update oss config 2023-06-12 14:15:37 +08:00
zhangchenbiao
7870cbe062 修改oss ak sk配置 2023-06-12 13:38:24 +08:00
zhangchenbiao
69fe040142 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-12 10:16:52 +08:00
zhangchenbiao
0209c009ea 修改oss ak sk配置 2023-06-12 10:16:43 +08:00
pserimal
94a7dfda58 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml
2023-06-09 17:56:39 +08:00
zhangchenbiao
c6c1c5bb97 修改oss bucket 2023-06-09 14:40:26 +08:00
pserimal
58d3e65fc2 Merge branch 'cc_20230520_partner' of http://gitlab.coolcollege.cn/hangzhou/java/coolstore-partner-manage into cc_20230520_partner
# Conflicts:
#	coolstore-partner-webb/src/main/java/com/cool/store/config/TokenValidateFilter.java
2023-06-09 13:44:21 +08:00
zhangchenbiao
4ebca4730a cors 2023-06-09 11:12:56 +08:00
zhangchenbiao
425d1acafa cors 2023-06-09 10:51:35 +08:00
zhangchenbiao
b8d6917359 update 2023-06-09 10:29:19 +08:00
zhangchenbiao
7734a4fbcc update 2023-06-09 10:02:00 +08:00
zhangchenbiao
0b0e2d3f9e update 2023-06-09 09:40:57 +08:00
zhangchenbiao
027860db2f update 2023-06-08 20:38:10 +08:00
zhangchenbiao
9e749062d0 update 2023-06-08 20:36:44 +08:00
zhangchenbiao
fe5ce03550 update corpid 2023-06-08 19:43:04 +08:00
zhangchenbiao
6e227586d5 update url 2023-06-08 17:02:01 +08:00
zhangchenbiao
171957bea0 写死菜单 2023-06-08 17:01:31 +08:00
pserimal
e87d2948f4 动态管理 2023-06-08 16:49:28 +08:00
zhangchenbiao
af7188f223 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner
# Conflicts:
#	coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java
2023-06-08 15:57:58 +08:00