nisen
|
386afebce4
|
Merge branch 'zcwy0716-llf' into dev0525
|
2024-07-17 16:49:39 +08:00 |
|
zhaolongfei
|
d60a1521f9
|
在线管理资源完成情况修改,添加日志,先暂时注释
|
2024-07-17 16:48:38 +08:00 |
|
nisen
|
9bec1afacf
|
Merge branch 'zcwy0716-llf' into dev0525
|
2024-07-17 16:25:29 +08:00 |
|
zhaolongfei
|
34db08d1a8
|
在线管理资源完成情况修改,添加日志
|
2024-07-17 16:24:22 +08:00 |
|
nisen
|
dd68754a1e
|
Merge branch 'zcwy0716-llf' into dev0525
|
2024-07-17 16:02:36 +08:00 |
|
zhaolongfei
|
2822021f30
|
在线管理资源完成情况修改,添加日志
|
2024-07-17 16:01:05 +08:00 |
|
nisen
|
6aae7ac070
|
Merge branch 'zcwy0716-llf' into dev0525
|
2024-07-17 15:41:07 +08:00 |
|
zhaolongfei
|
63d3844b76
|
在线管理资源完成情况修改,添加日志
|
2024-07-17 15:40:13 +08:00 |
|
nisen
|
b81bdc7179
|
Merge branch 'zcwy0716-llf' into dev0525
|
2024-07-17 14:51:06 +08:00 |
|
zhaolongfei
|
e9645d631d
|
在线管理资源完成情况修改,添加日志
|
2024-07-17 14:49:55 +08:00 |
|
nisen
|
de6c405af4
|
Merge branch 'zcwy0716-llf' into dev0525
|
2024-07-17 14:41:21 +08:00 |
|
zhaolongfei
|
588f527293
|
在线管理资源完成情况修改,添加日志
|
2024-07-17 14:40:10 +08:00 |
|
nisen
|
275cc76f55
|
Merge branch 'zcwy0716-llf' into dev0525
|
2024-07-17 14:32:35 +08:00 |
|
zhaolongfei
|
99df06481f
|
在线管理资源完成情况修改,添加日志
|
2024-07-17 14:30:44 +08:00 |
|
nisen
|
dba0386bcd
|
Merge branch 'zcwy0716-llf' into dev0525
|
2024-07-17 14:15:32 +08:00 |
|
zhaolongfei
|
921aa5909e
|
在线管理资源完成情况修改
|
2024-07-17 13:56:34 +08:00 |
|
nisen
|
290417534c
|
Merge branch 'zcwy0716-llf' into dev0525
|
2024-07-17 13:51:51 +08:00 |
|
zhaolongfei
|
d514450f23
|
在线管理资源完成情况修改
|
2024-07-17 13:49:24 +08:00 |
|
nisen
|
db6febcd54
|
Merge remote-tracking branch 'yx/zcwy0716-llf' into dev0525
|
2024-07-17 13:37:20 +08:00 |
|
zhaolongfei
|
00c1fe8c49
|
在线管理资源完成情况修改
|
2024-07-17 13:36:34 +08:00 |
|
nisen
|
16239a68dc
|
Merge branch 'zcwy0716-llf' into dev0525
|
2024-07-17 13:23:29 +08:00 |
|
zhaolongfei
|
92aa649fa1
|
在线管理资源完成情况修改
|
2024-07-17 13:22:12 +08:00 |
|
nisen
|
1be244e483
|
Merge branch 'zcwy0622-yang' into dev0525
|
2024-07-17 10:32:37 +08:00 |
|
nisen
|
c25fd9c384
|
Merge branch 'zcwy0716-llf' into dev0525
|
2024-07-17 10:30:48 +08:00 |
|
zhaolongfei
|
019d534956
|
在线管理资源完成情况修改
|
2024-07-17 10:29:27 +08:00 |
|
nisen
|
e0b0516ae0
|
Merge remote-tracking branch 'yx/zcwy0716-llf' into dev0525
|
2024-07-17 10:22:00 +08:00 |
|
zhaolongfei
|
b67d931741
|
在线管理资源完成情况修改
|
2024-07-17 10:20:34 +08:00 |
|
yang
|
897a44e2c3
|
成长路径图,解除绑定接口去除
|
2024-07-17 10:20:23 +08:00 |
|
nisen
|
802130aa75
|
Merge remote-tracking branch 'yx/zcwy0716-llf' into dev0525
|
2024-07-17 09:47:39 +08:00 |
|
zhaolongfei
|
1bd09c0f02
|
在线管理资源完成情况修改
|
2024-07-17 09:45:50 +08:00 |
|
nisen
|
c72f3eb640
|
Merge remote-tracking branch 'yx/zcwy0716-llf' into dev0525
|
2024-07-17 09:37:57 +08:00 |
|
zhaolongfei
|
1794344829
|
在线管理资源完成情况修改
|
2024-07-17 09:37:19 +08:00 |
|
nisen
|
1df65fce85
|
Merge remote-tracking branch 'yx/zcwy0716-llf' into dev0525
|
2024-07-17 09:07:25 +08:00 |
|
zhaolongfei
|
952f47fdc6
|
在线管理资源完成情况修改
|
2024-07-17 09:06:31 +08:00 |
|
zhaolongfei
|
f19b928bc9
|
在线课固定时长问题修改
|
2024-07-17 09:05:38 +08:00 |
|
nisen
|
529fb59167
|
Merge remote-tracking branch 'yx/zcwy0716-llf' into dev0525
|
2024-07-17 09:03:30 +08:00 |
|
zhaolongfei
|
df91242e1b
|
在线管理资源完成情况问题修改
|
2024-07-16 19:57:36 +08:00 |
|
yang
|
262463bb7f
|
Merge branch 'refs/heads/zcwy0622-yang' into dev0525
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java
|
2024-07-15 10:23:05 +08:00 |
|
yang
|
a019726181
|
成长路径图,内部考试引用关系,以及导入bug修复
|
2024-07-15 10:21:32 +08:00 |
|
yang
|
4e08676639
|
Merge branch 'refs/heads/zcwy0622-yang' into dev0525
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java
|
2024-07-11 16:34:18 +08:00 |
|
yang
|
3b34cc1bde
|
成长路径图,考试添加关联字段
|
2024-07-11 16:33:22 +08:00 |
|
yang
|
c7f4f9fc01
|
Merge branch 'refs/heads/zcwy0622-yang' into dev0525
|
2024-07-11 11:07:44 +08:00 |
|
yang
|
be18e35583
|
成长路径图,考试导入完成状态去除
|
2024-07-11 11:07:26 +08:00 |
|
yang
|
ae3a56891c
|
Merge branch 'refs/heads/zcwy0622-yang' into dev0525
|
2024-07-10 16:55:23 +08:00 |
|
yang
|
bd25fc1d1a
|
成长路径图,考试同步,限制事务范围
|
2024-07-10 16:55:17 +08:00 |
|
yang
|
b049aa81f5
|
Merge branch 'refs/heads/zcwy0622-yang' into dev0525
|
2024-07-10 16:28:57 +08:00 |
|
yang
|
91b0b899b0
|
成长路径图,考试同步,限制事务范围
|
2024-07-10 16:28:42 +08:00 |
|
yang
|
85753b7261
|
Merge branch 'refs/heads/zcwy0622-yang' into dev0525
|
2024-07-10 14:25:36 +08:00 |
|
yang
|
983313e845
|
成长路径图,考试同步
|
2024-07-10 14:25:18 +08:00 |
|
yang
|
a71b6232cb
|
Merge branch 'refs/heads/zcwy0622-yang' into dev0525
|
2024-07-10 12:49:34 +08:00 |
|