hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-09 10:56:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,321 Commits 90 Branches 1 Tag
529fb59167605b4e712b6396ba9de07d2a692e7a
Commit Graph

1321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
yang
f4c1bd7eed 成长路径图，考试次数 2024-07-10 12:49:19 +08:00
yang
ef40c39749 Merge branch 'refs/heads/zcwy0622-yang' into dev0525 2024-07-10 08:51:31 +08:00
yang
0ac6622526 成长路径图，去除导入同步 2024-07-10 08:51:24 +08:00
yang
6924744c07 Merge remote-tracking branch 'origin/dev0525' into dev0525 2024-07-09 13:51:25 +08:00
yang
00fa85add2 Merge branch 'refs/heads/zcwy0622-yang' into dev0525 2024-07-09 13:51:11 +08:00
yang
9a83f64e38 成长路径图，导入添加同步信息 2024-07-09 13:50:55 +08:00
zhaolongfei
aab518b522 Merge branch 'dev0525' of http://10.251.129.121/boeu/java-servers into dev0525 2024-07-09 09:49:21 +08:00
zhaolongfei
20484a83da Merge branch 'zcwy0704-llf' into dev0525 2024-07-09 09:48:48 +08:00
zhaolongfei
3116bed63c 在线课固定时长问题修改 2024-07-09 09:47:36 +08:00
yang
45d5233448 Merge remote-tracking branch 'origin/dev0525' into dev0525 2024-07-08 16:07:01 +08:00
yang
1f2fa21c93 Merge branch 'refs/heads/zcwy0622-yang' into dev0525 2024-07-08 16:06:49 +08:00
yang
26a2a8e709 成长路径图，bug修复 2024-07-08 16:06:42 +08:00
zhaolongfei
b219a46a74 Merge branch 'zcwy0704-llf' into dev0525 2024-07-08 15:52:14 +08:00
zhaolongfei
d90f4d883f 在线课固定时长问题修改 2024-07-08 15:51:32 +08:00
zhaolongfei
43d99828e6 Merge branch 'zcwy0704-llf' into dev0525 2024-07-08 15:30:35 +08:00
zhaolongfei
901638dea9 在线课固定时长问题修改 2024-07-08 15:29:48 +08:00
yang
532a502cf1 Merge branch 'refs/heads/zcwy0622-yang' into dev0525 2024-07-08 14:50:27 +08:00
yang
170dc45c64 成长路径图，导入考试去除属性 2024-07-08 14:49:54 +08:00
yang
5594e07264 成长路径图，考试计数 2024-07-08 14:49:31 +08:00
yang
e868833696 Merge branch 'refs/heads/zcwy0622-yang' into dev0525 2024-07-08 11:36:00 +08:00
yang
13b5e6ab4c 成长路径图，考试实时同步,去除异常 2024-07-08 11:35:47 +08:00
yang
d0944b05e0 Merge branch 'refs/heads/zcwy0622-yang' into dev0525 
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
#	servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java
#	servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java
#	servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java
 2024-07-08 11:18:32 +08:00
yang
e144fde444 成长路径图，考试实时同步 2024-07-08 11:12:57 +08:00
joshen
7b2217c017 Merge branch 'zcwy0618-llf' into 'master' 
Zcwy0618 llf

See merge request !112
 2024-07-05 17:48:02 +08:00
zhaolongfei
0cdbdfbb30 Merge branch 'zcwy0618-llf' into dev0525 2024-07-05 15:19:01 +08:00
zhaolongfei
333f29f008 在线课考试分数状态问题修改 2024-07-05 15:17:38 +08:00
zhaolongfei
439737f9a5 Merge branch 'zcwy0704-llf' into dev0525 2024-07-05 09:19:16 +08:00
zhaolongfei
88158e7ebf 创建在线课时的问题修改 2024-07-05 09:17:06 +08:00
zhaolongfei
4e870985a8 Merge branch 'zcwy0704-llf' into dev0525 
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
#	servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java
 2024-07-04 20:19:31 +08:00
zhaolongfei
973afb94b4 成长路径考试同步 2024-07-04 20:16:04 +08:00
xiaozhequ
da566414eb Merge branch 'zcwy-0613-wjw' into dev0525 2024-07-04 16:22:57 +08:00
xiaozhequ
407c7693bb 区分新建课 2024-07-04 16:21:48 +08:00
zhaolongfei
e69ab94c8c Merge branch 'zcwy0704-llf' into dev0525 2024-07-04 15:40:31 +08:00
zhaolongfei
9aa852e56f 优化在线课时长添加 2024-07-04 15:40:08 +08:00
zhaolongfei
42040f023d Merge branch 'zcwy0704-llf' into dev0525 2024-07-04 15:37:47 +08:00