Commit Graph

4587 Commits

Author SHA1 Message Date
huangshengfa
f312123f6d Merge branch 'pre-release' into 'release'
Pre release

See merge request !68
2023-03-09 08:44:08 +08:00
wyx
3cc129471a Merge branch 'develop' into manage-release 2023-03-09 07:53:20 +08:00
yuping
ac50f5bea4 Merge remote-tracking branch 'origin/develop' into develop 2023-03-09 00:55:09 +08:00
yuping
c8dbc48609 -- fix 在线课重复 2023-03-09 00:54:48 +08:00
wyx
5c6a0fe828 Merge branch 'develop' into manage-release 2023-03-09 00:42:14 +08:00
lixg
43b1846706 feat:合并 2023-03-09 00:22:34 +08:00
lixg
909edbbbdd feat:修改评估复制 2023-03-09 00:22:07 +08:00
李东进1
2151b091f9 update 2023-03-09 00:14:06 +08:00
lixg
4513749368 feat:合并 2023-03-09 00:03:00 +08:00
lixg
12b3cf33e9 feat:修改复制传参 2023-03-09 00:02:29 +08:00
lpq
55e721f602 学员添加判断 2023-03-08 23:59:42 +08:00
lixg
fc1d2dde68 feat:合并 2023-03-08 23:28:14 +08:00
lixg
093d8f0de4 feat:修改复制参数 2023-03-08 23:27:45 +08:00
wyx
003c3b0e00 fix:评估管理-单选题-多选题-问答题-评分提编辑删除选项保存修改bug修复 2023-03-08 23:25:01 +08:00
lpq
06875c82fb 去掉多余的debugger 2023-03-08 22:18:18 +08:00
wyx
914094e228 fix:修改版本号 2023-03-08 22:14:29 +08:00
wyx
3d224974e7 Merge branch 'develop' into manage-release 2023-03-08 22:14:06 +08:00
wyx
4ccaf34d49 fix:评估管理评估编辑问题 2023-03-08 21:59:42 +08:00
wyx
6390eb6e9f feat:项目-学员管理-学员查看-证书数量传递 2023-03-08 20:46:15 +08:00
wyx
eab1292e38 style 2023-03-08 19:05:58 +08:00
wyx
b662d41791 style 2023-03-08 18:47:29 +08:00
huangshengfa
c684115eba Merge branch 'pre-release' into 'release'
Pre release

See merge request !67
2023-03-08 17:44:55 +08:00
huangshengfa
9291626d80 Merge branch 'pre-dev' into 'develop'
Pre dev

See merge request !66
2023-03-08 17:43:36 +08:00
wyx
7276fd58a0 Merge branch 'develop' into manage-release 2023-03-08 17:35:42 +08:00
wyx
fa81d6c16c fix:岗位显示修改 2023-03-08 17:35:21 +08:00
wyx
771bf35ccc Merge branch 'develop' into manage-release 2023-03-08 17:28:40 +08:00
wyx
390afad00d fix:域名修改 2023-03-08 17:28:26 +08:00
wyx
1b76de982a fix:修改版本号 2023-03-08 17:19:13 +08:00
wyx
d225f7482b Merge branch 'develop' into manage-release 2023-03-08 17:18:46 +08:00
yuping
b6019bfec6 -- fix 项目任务 管理查看权限 2023-03-08 17:17:54 +08:00
yuping
f75d12bf58 Merge remote-tracking branch 'origin/develop' into develop 2023-03-08 17:01:25 +08:00
yuping
61ce5ccac7 -- fix 项目任务 管理 2023-03-08 17:01:09 +08:00
wyx
9ab5683222 style 2023-03-08 16:57:50 +08:00
huangshengfa
19c5798ae5 Merge branch 'new-dev-n' into 'develop'
New dev n

See merge request !64
2023-03-08 16:28:23 +08:00
wyx
d952369464 fix:style 2023-03-08 16:21:14 +08:00
huangshengfa
83e84cb026 Merge branch 'dev_m' into 'develop'
fix: 菜单修改

See merge request !63
2023-03-08 15:44:46 +08:00
mx00085@163.com
0f22c8a458 fix: 菜单修改 2023-03-08 15:43:02 +08:00
wyx
a5e3842e89 style 2023-03-08 15:38:48 +08:00
wyx
ba6a5105bd style 2023-03-08 14:58:21 +08:00
wyx
989ad97b42 style 2023-03-08 14:27:06 +08:00
yuping
2efd479756 -- fix 2023-03-08 13:59:18 +08:00
yuping
bb53067fc8 Merge remote-tracking branch 'origin/develop' into develop 2023-03-08 12:43:57 +08:00
yuping
fc23e28da5 -- fix 2023-03-08 12:43:45 +08:00
wyx
bae62258e7 fix:点击新建评估跳转评估页面自动打开新建评估弹框 2023-03-08 12:36:33 +08:00
wyx
316add9911 fix:限制输入最大值设置 2023-03-08 11:38:13 +08:00
huangshengfa
3e3a25e2a7 Merge branch 'new-dev' into 'develop'
New dev

See merge request !62
2023-03-08 09:20:34 +08:00
huangshengfa
00a270841f Merge branch 'pre-release' into 'release'
Pre release

See merge request !61
2023-03-08 09:20:05 +08:00
wyx
7e710aa148 Merge branch 'develop' into manage-release 2023-03-08 08:42:13 +08:00
wyx
bd32f48399 fix:评估图片显示 2023-03-08 08:41:44 +08:00
yuping
49dc8a552e -- fix 权限管理 2023-03-08 02:13:39 +08:00