Commit Graph

1318 Commits

Author SHA1 Message Date
俞扬
2ff7b04d0c Merge branch 'cc_20230520_partner' of http://gitlab.coolcollege.cn/hangzhou/java/coolstore-partner-manage into cc_20230520_partner
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java
#	coolstore-partner-webb/src/main/resources/application-dev.properties
2023-06-16 11:48:29 +08:00
俞扬
0479f46eda 加盟商资质审核 2023-06-16 11:46:04 +08:00
zhangchenbiao
e9b2ba6cc8 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner
# Conflicts:
#	coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java
2023-06-16 11:20:08 +08:00
zhangchenbiao
960fb0bb53 新增阿里云对接方法 2023-06-16 11:18:38 +08:00
苏竹红
a6a6093dd9 私海列表 2023-06-16 10:09:44 +08:00
wxp01309236
0ad84af01f 意向书信息维护 2023-06-15 22:04:30 +08:00
苏竹红
8a67417998 招商经理等 2023-06-15 19:26:51 +08:00
pserimal
d80c70deb7 面试通过函详情及通过函生成和OSS服务器上传文件 2023-06-15 19:02:21 +08:00
pserimal
3fb8e439ec 动态管理使用枚举类 2023-06-15 18:16:07 +08:00
苏竹红
c8914d554f 高级设置 2023-06-15 09:39:56 +08:00
wxp01309236
3e6801f522 小程序登录 2023-06-14 21:06:06 +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
81516f1fe2 add log 2023-06-14 10:46:42 +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
苏竹红
972407e9b0 B端 部分接口1 2023-06-13 16:04:25 +08:00
苏竹红
1558a86992 B端 部分接口1 2023-06-13 15:45:18 +08:00
苏竹红
deace8ecd5 B端 部分接口 2023-06-13 15:43:27 +08:00
zhangchenbiao
66cab97c70 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-13 09:50:18 +08:00
zhangchenbiao
12cb59dca8 新增组织架构同步相关 2023-06-13 09:50:10 +08:00
苏竹红
5a6cd73113 B端 部分接口 2023-06-13 09:47:07 +08:00
zhangchenbiao
a2d58d3dcc 新增组织架构相关 2023-06-12 16:42:39 +08:00
pserimal
545c8a4b3f merge-code 2023-06-09 18:08:03 +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
俞扬
7fe6a15cb6 面试信息表字段更新,逆向生成文件 2023-06-09 17:53:30 +08:00
pserimal
803625b20a 加盟商资格面试查询面试信息 2023-06-09 17:50:48 +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
171957bea0 写死菜单 2023-06-08 17:01:31 +08:00
pserimal
e87d2948f4 动态管理 2023-06-08 16:49:28 +08:00
zhangchenbiao
665cb2190f 大调整 2023-06-08 15:58:05 +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
zhangchenbiao
071725fb3d 大调整 2023-06-08 15:57:28 +08:00
苏竹红
1fd13c74d4 C端城市相关接口 2023-06-07 20:24:37 +08:00
zhangchenbiao
7370e327f0 add 2023-06-06 17:33:10 +08:00
zhangchenbiao
23f26ee0ed Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-06 17:32:56 +08:00
zhangchenbiao
2d0d896a58 deleted 2023-06-06 17:32:47 +08:00
苏竹红
2bf824e539 接口拆分 2023-06-06 09:49:42 +08:00
zhangchenbiao
7a78f59ad7 update 2023-06-06 09:43:31 +08:00
zhangchenbiao
04e7ebea85 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-05 11:34:52 +08:00
zhangchenbiao
0576ed223a 企业同步 2023-06-05 11:34:44 +08:00
苏竹红
91ae5ac0ea C端接口 2023-06-02 14:54:58 +08:00
zhangchenbiao
c43388af90 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner
# Conflicts:
#	coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
2023-05-31 16:48:35 +08:00