4773 Commits

Author SHA1 Message Date
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
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
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
44d99cedef update 2023-06-09 10:38:08 +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
bb9598e734 update 2023-06-08 20:39:12 +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
0545d37b91 update 2023-06-08 20:02:51 +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
9658b7599d Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-08 17:01:41 +08:00
zhangchenbiao
171957bea0 写死菜单 2023-06-08 17:01:31 +08:00
pserimal
e87d2948f4 动态管理 2023-06-08 16:49:28 +08:00
pserimal
e86f563d44 Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-06-08 16:10:10 +08:00
pserimal
3c09ad7541 添加page分页参数 2023-06-08 16:09:30 +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
8e866554a1 update 2023-06-06 17:47:03 +08:00
zhangchenbiao
bf965a2835 delete 2023-06-06 17:45:20 +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
苏竹红
5eebbc9cf3 去掉路径enterprise-id 2023-06-06 14:20:55 +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
苏竹红
9d0b924404 C端接口 2023-06-02 15:08:11 +08:00
苏竹红
91ae5ac0ea C端接口 2023-06-02 14:54:58 +08:00
zhangchenbiao
09f651ed0d update 2023-06-01 11:37:03 +08:00
zhangchenbiao
0cabc939fc update 2023-05-31 16:49:37 +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
zhangchenbiao
5070f52076 update 2023-05-31 16:47:04 +08:00
苏竹红
4ffa65d58d Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner 2023-05-31 16:10:22 +08:00
苏竹红
ad2c104cce 接口定义 2023-05-31 16:10:13 +08:00
zhangchenbiao
b00a91d060 add 2023-05-31 15:36:45 +08:00
zhangchenbiao
39cef07e6a update 2023-05-31 15:36:25 +08:00
苏竹红
de94c572ef 接口定义 2023-05-31 11:43:53 +08:00