Commit Graph

4369 Commits

Author SHA1 Message Date
huangshengfa
da1aa4a884 Merge branch 'pre-master' into 'master'
Pre master

See merge request !80
2023-03-10 20:20:50 +08:00
huangshengfa
77f2f700dc Merge branch 'pre-dev' into 'develop'
Pre dev

See merge request !79
2023-03-10 20:03:58 +08:00
wyx
5d32e634b7 fix:修改版本号 2023-03-10 19:54:59 +08:00
wyx
d6291d86b9 fix:修改版本号 2023-03-10 19:53:48 +08:00
wyx
beb6905312 Merge branch 'develop' into manage-release 2023-03-10 19:52:49 +08:00
wyx
f1f438b952 fix:作业无附件处理 2023-03-10 18:07:21 +08:00
yujicun
8470b42cfb Merge remote-tracking branch 'origin/develop' into develop 2023-03-10 18:07:17 +08:00
yuping
c3f9bad2a7 Merge remote-tracking branch 'origin/develop' into develop 2023-03-10 17:53:23 +08:00
yuping
434665e7e9 -- fix bug 2023-03-10 17:53:04 +08:00
yujicun
81d0bb7d06 Merge remote-tracking branch 'origin/master' 2023-03-10 17:48:16 +08:00
wyx
9f23973035 Merge branch 'manage-release' 2023-03-10 17:21:05 +08:00
wyx
09e06d3aec Merge branch 'develop' into manage-release 2023-03-10 17:20:34 +08:00
lixg
942991ca3c feat:合并 2023-03-10 17:17:59 +08:00
lixg
9ee7f16f88 feat:修改评估二维码 2023-03-10 17:13:11 +08:00
wyx
4b6eda4b07 fix:修改版本号 2023-03-10 17:05:18 +08:00
wyx
197540a7a4 fix:修改版本号 2023-03-10 17:04:14 +08:00
wyx
f46b538950 Merge branch 'develop' into manage-release 2023-03-10 17:03:51 +08:00
caozc
a814c0d2fe update 2023-03-10 16:13:12 +08:00
yuping
ba5810826f Merge remote-tracking branch 'origin/develop' into develop 2023-03-10 15:57:06 +08:00
yuping
fa33f4f9de -- fix 项目权限 2023-03-10 15:56:29 +08:00
huangshengfa
b094bb87d3 Merge branch 'dev_m_pre' into 'release'
update

See merge request !78
2023-03-10 15:55:15 +08:00
BOE\10867418
501321e328 update 2023-03-10 15:53:16 +08:00
huangshengfa
d107c76458 Merge branch 'dev_m_pre' into 'release'
修改域名

See merge request !77
2023-03-10 15:06:00 +08:00
BOE\10867418
d35fd52e0f 修改域名 2023-03-10 15:03:53 +08:00
caozc
37822ffd11 update: 优化影藏时长 2023-03-10 14:24:52 +08:00
huangshengfa
aa32dfa5f1 Merge branch 'dev_m' into 'release'
Dev m

See merge request !72
2023-03-10 14:16:16 +08:00
wyx
0f08aa0419 fix:用户头像显示问题修复 2023-03-10 13:19:10 +08:00
peiqingliu
c9873ea3ba Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-03-10 13:00:40 +08:00
peiqingliu
0cad3809b4 修改 2023-03-10 13:00:24 +08:00
yujicun
9ec9fb1d24 Merge remote-tracking branch 'origin/master' 2023-03-10 03:45:29 +08:00
wyx
3fc1120df3 Merge branch 'manage-release' 2023-03-10 03:42:23 +08:00
wyx
ad93a9b197 Merge branch 'develop' into manage-release 2023-03-10 03:41:56 +08:00
yuping
2494933f9e -- fix 发布修改 2023-03-10 03:23:55 +08:00
yujicun
345b7a7f72 Merge remote-tracking branch 'origin/master' 2023-03-10 01:50:24 +08:00
wyx
d4281fe047 fix:修改版本号 2023-03-10 01:36:56 +08:00
wyx
4dc9ce2ca4 Merge branch 'manage-release' 2023-03-10 01:36:25 +08:00
wyx
2a821353b4 Merge branch 'develop' into manage-release 2023-03-10 01:35:47 +08:00
wyx
72b419972c fix:面授课开课复制问题 2023-03-10 00:00:47 +08:00
wyx
43fefc29fc fix:面授课管理是否发布及开课按钮判断修改 2023-03-09 23:47:47 +08:00
wyx
88c23aac6a fix:生产环境模板下载修改 2023-03-09 23:30:54 +08:00
wyx
762c3ada96 fix:查看作业,作业附件名字显示问题 2023-03-09 22:56:42 +08:00
wyx
a716aa464b fix:项目/路径图/模板库-共享文档下载问题 2023-03-09 22:13:53 +08:00
huangshengfa
69ec33aec3 Merge branch 'pre-master' into 'master'
Pre master

See merge request !76
2023-03-09 21:36:18 +08:00
wyx
c87765a372 Merge branch 'manage-release' 2023-03-09 21:12:54 +08:00
wyx
e561f8289d Merge branch 'develop' into manage-release 2023-03-09 21:12:00 +08:00
wyx
d8a2266ce9 fix:修改生产环境文件路径地址 2023-03-09 21:11:13 +08:00
wyx
b53750e7cb Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-03-09 21:10:36 +08:00
wyx
62ede882b5 fix:修改生产环境文件路径地址 2023-03-09 21:10:04 +08:00
yuping
f33d7ee514 -- fix 生产路径变更 2023-03-09 21:03:37 +08:00
huangshengfa
7f4c1ad186 Merge branch 'pre-master' into 'master'
Pre master

See merge request !75
2023-03-09 18:35:40 +08:00