Commit Graph

2986 Commits

Author SHA1 Message Date
zhangsir
c054026259 修改接口 2024-07-12 15:57:05 +08:00
zhangsir
247ddc6120 Merge branch 'zcwy-master' into dev0515 2024-07-12 14:34:42 +08:00
zhangsir
482cd48571 修改接口 2024-07-12 14:34:03 +08:00
joshen
530dbf241d 生产添加外部企业权限控制 2024-07-12 14:23:18 +08:00
zhangsir
300072e778 Merge branch 'dev-0711' into dev0515
# Conflicts:
#	src/components/PortalHeader.vue
2024-07-12 08:53:50 +08:00
joshen
8cca156955 外部用户权限控制 2024-07-11 21:32:47 +08:00
zhangsir
ac6640c865 Merge branch 'zcwy-master' into dev0515 2024-07-11 19:09:45 +08:00
zhangsir
2dc9bcdbd3 修改 2024-07-11 19:09:02 +08:00
zhangsir
8037dcc97c Merge branch 'zcwy-master' into dev0515 2024-07-11 15:02:05 +08:00
zhangsir
3e57c4bedb 展示方式 2024-07-11 15:01:38 +08:00
zhangsir
235f0bccad Merge branch 'zcwy-master' into dev0515 2024-07-11 13:50:03 +08:00
zhangsir
d9bc4603af 没参数修改调用接口 2024-07-11 13:49:34 +08:00
zhangsir
44b8e14706 Merge branch 'boe_0705_master' into dev0515 2024-07-11 13:19:28 +08:00
zhangsir
7ceb605844 当前排名 2024-07-11 13:18:58 +08:00
zhangsir
d5f343a4be Merge branch 'zcwy-master' into dev0515 2024-07-11 10:59:37 +08:00
zhangsir
158c836cd1 细节 2024-07-11 10:59:07 +08:00
zhangsir
ff605dceed Merge branch 'zcwy-master' into dev0515 2024-07-10 19:29:20 +08:00
zhangsir
972f2cb097 小细节 2024-07-10 19:28:48 +08:00
zhangsir
7d15e7ae21 Merge branch 'boe_0705_master' into dev0515 2024-07-10 18:46:02 +08:00
zhangsir
26f2d3f9d3 经验值展示 2024-07-10 18:45:35 +08:00
zhangsir
eb9d68ccd4 Merge branch 'zcwy-master' into dev0515 2024-07-10 16:47:56 +08:00
zhangsir
c98e079684 修改文字 2024-07-10 16:47:29 +08:00
zhangsir
94dc71b911 Merge branch 'zcwy-master' into dev0515 2024-07-10 10:02:57 +08:00
zhangsir
a07f38d33c 修改专业力必修显示问题 2024-07-10 10:02:31 +08:00
zhangsir
cab9c0db2e Merge branch 'boe_0705_master' into dev0515 2024-07-09 17:00:22 +08:00
zhangsir
f193857ec7 经验排行榜增加当前 2024-07-09 16:59:50 +08:00
zhangsir
81642ce1ce Merge branch 'zcwy-master' into dev0515 2024-07-08 19:00:38 +08:00
zhangsir
21cf02d873 修改任务、飞机定位 2024-07-08 19:00:13 +08:00
zhangsir
8f427ab177 Merge branch 'zcwy-master' into dev0515 2024-07-08 10:43:12 +08:00
zhangsir
275e59987f 已读调接口 2024-07-08 10:42:32 +08:00
zhangsir
3ba92a3e02 Merge branch 'zcwy-master' into dev0515
# Conflicts:
#	src/views/study/coursenew.vue
2024-07-08 09:56:44 +08:00
zhangsir
cb43195803 未读数量 2024-07-08 09:54:14 +08:00
joshen
9b0525994a Merge branch 'boe_0705_master' into 'master'
课程状态、在线课权限

See merge request !120
2024-07-05 18:02:19 +08:00
zhangsir
ddbb6c7a2e Merge branch 'boe_0705_master' into zcwy-master
# Conflicts:
#	src/assets/images/ban.png
#	src/views/study/coursenew.vue
2024-07-05 17:31:29 +08:00
zhangsir
0a35bf6023 课程状态、在线课权限 2024-07-05 16:20:14 +08:00
zhangsir
e520fb10d4 Merge branch 'zcwy-master' into dev0515 2024-07-05 14:56:39 +08:00
zhangsir
0e18d143d9 Merge branch 'dev0124' into zcwy-master 2024-07-05 14:56:02 +08:00
zhangsir
a3e17cd87e Merge branch 'zcwy-master' into dev0515 2024-07-05 14:54:01 +08:00
zhangsir
99ea8d35c9 细节 2024-07-05 14:53:23 +08:00
zhangsir
df2e485d31 Merge branch 'boe_0701_icon' into dev0515 2024-07-05 13:16:51 +08:00
zhangsir
c67fcaf48c bug 2024-07-05 13:16:19 +08:00
zhangsir
cab919ba8c Merge branch 'boe_0701_icon' into dev0515 2024-07-05 10:38:09 +08:00
zhangsir
bbb8f44983 bug 2024-07-05 10:37:40 +08:00
zhangsir
57d08b8ced Merge branch 'boe_0704_line' into dev0515 2024-07-04 16:42:56 +08:00
zhangsir
ec3abb9901 只列表添加 2024-07-04 16:42:20 +08:00
zhangsir
88ae166e13 Merge branch 'boe_0704_line' into dev0515 2024-07-04 16:25:18 +08:00
zhangsir
b0c5fcbf8c 在线增加参数 2024-07-04 16:24:42 +08:00
zhangsir
7f1ea1fe89 Merge branch 'boe_0704_line' into dev0515 2024-07-04 11:26:05 +08:00
zhangsir
694c9c5be7 提交增加受众 2024-07-04 11:25:33 +08:00
zhangsir
eeceb3c66e Merge branch 'boe_0701_icon' into dev0515 2024-07-04 11:01:50 +08:00