Commit Graph

921 Commits

Author SHA1 Message Date
670788339
269d8eea93 例外人员固定 2024-03-07 13:57:02 +08:00
670788339
5ace3fc421 Merge branch 'zcwy_yk'
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java
2024-03-01 15:41:14 +08:00
yang康1999
90c044dba4 首页搜索,面授课多讲师相关 2024-03-01 12:51:28 +08:00
xiaozhequ
0faed83c3d 修改课程页面的离职教师 2024-01-18 13:52:33 +08:00
xiaozhequ
822e6062ad 修改thirdapi的bug 2024-01-18 10:52:31 +08:00
xiaozhequ
e4a30e0282 替换离职人员信息2 2024-01-17 14:04:17 +08:00
yang康1999
dfc8211103 案例搜索接口修改4 2024-01-11 18:13:04 +08:00
yang康1999
04d86838f2 用户登录组织信息更新调整4 2023-12-06 10:03:07 +08:00
yang康1999
b674e8b562 用户登录组织信息更新调整3 2023-12-06 09:52:54 +08:00
joshen@zcwytd.com
e25a7c2b5c boenewlogin新增日志 2023-12-06 09:39:01 +08:00
joshen@zcwytd.com
f27e20b883 boenewlogin新增日志 2023-12-06 09:30:58 +08:00
yang康1999
de65bfa0ab 用户登录组织信息更新调整2 2023-12-05 17:52:55 +08:00
yang康1999
0468949d7d 用户登录组织信息更新调整 2023-12-05 17:51:47 +08:00
joshen@zcwytd.com
a308f1d94e Retryable 2023-11-29 13:23:19 +08:00
joshen@zcwytd.com
ba1a96ce8f Caused by: java.sql.SQLException: Lock wait timeout exceeded; try restarting transaction 2023-11-28 17:06:13 +08:00
joshen@zcwytd.com
ee6a545e02 Caused by: java.sql.SQLException: Lock wait timeout exceeded; try restarting transaction 2023-11-28 17:05:41 +08:00
joshen@zcwytd.com
9f0fb46bba 获取例外人员 2023-11-24 21:11:45 +08:00
joshen@zcwytd.com
bdd7395161 获取例外人员 2023-11-24 21:00:39 +08:00
joshen@zcwytd.com
92c1a38a4c 获取例外人员 日志 2023-11-24 20:33:38 +08:00
joshen@zcwytd.com
849591d700 获取例外人员 日志 2023-11-24 20:25:07 +08:00
joshen@zcwytd.com
1c1db72505 获取例外人员 日志 2023-11-24 19:59:45 +08:00
joshen@zcwytd.com
2f9c132e22 通过token获取userid 2023-11-24 18:51:59 +08:00
joshen@zcwytd.com
3bcc848b7c 加日志 2023-11-24 18:39:32 +08:00
joshen@zcwytd.com
339062748b 判空加日志 2023-11-24 17:40:18 +08:00
joshen@zcwytd.com
0b42013330 判空 2023-11-24 17:33:17 +08:00
joshen@zcwytd.com
02c02c44cf 判空 2023-11-24 17:16:45 +08:00
joshen@zcwytd.com
2bd855a3ef 获取非报名课id 2023-11-24 16:32:52 +08:00
joshen@zcwytd.com
6f3a91687f 加字段 2023-11-24 16:28:25 +08:00
xiaozhequ
6d3cd19292 更新查询 2023-11-24 16:18:48 +08:00
xiaozhequ
f9f13f946a 邮箱@前三位 2023-11-10 18:05:31 +08:00
joshen
c365ad8f3f Merge branch 'zcwy0912' into 'master'
Zcwy0912

See merge request !42
2023-10-30 20:28:47 +08:00
joshen@zcwytd.com
32da545d24 Merge branch 'zcwy-master' into zcwy0912 2023-10-26 10:39:22 +08:00
lu
eaaa96dd2b upd 表字段注释 2023-10-26 10:22:54 +08:00
lu
2c0b1e73e0 upd 未上线字段注释 2023-10-26 10:17:15 +08:00
lu
63a07b6b26 upd 取消种类字段,暂不上线 2023-10-26 10:08:50 +08:00
joshen@zcwytd.com
6a1b42d2cd Merge branch 'zcwy-master' into zcwy0912 2023-10-26 09:53:00 +08:00
lu
85c87d4c3d upd 案例添加失效修改 2023-10-26 09:48:16 +08:00
xiaozhequ
cc6251d479 信息脱敏2 2023-10-25 17:24:28 +08:00
xiaozhequ
678445a878 Merge branch 'xiaozhequ' 2023-10-25 17:19:52 +08:00
xiaozhequ
72f2ea6164 信息脱敏1 2023-10-25 17:19:31 +08:00
xiaozhequ
653f3bc803 Revert "信息脱敏" 2023-10-25 17:16:32 +08:00
xiaozhequ
57c5529c27 Merge branch 'xiaozhequ'
# Conflicts:
#	servers/boe-server-all/pom.xml
2023-10-25 17:01:48 +08:00
xiaozhequ
77b07dd095 信息脱敏 2023-10-25 16:53:21 +08:00
joshen@zcwytd.com
2b5b883651 pom 2023-10-20 09:21:00 +08:00
joshen@zcwytd.com
bb315ad203 Merge branch 'zcwy-master' into zcwy0912 2023-10-20 09:06:02 +08:00
xiaozhequ
6e75d8b08a Merge remote-tracking branch 'origin/master' 2023-10-19 23:24:29 +08:00
xiaozhequ
a918f612c5 解决查询不出例外人 2023-10-19 23:15:15 +08:00
joshen@zcwytd.com
4d77462185 Merge branch 'zcwy-master' into zcwy0912 2023-10-18 19:39:02 +08:00
lu
38cc5e1625 视频埋点功能回调 2023-10-18 19:08:18 +08:00
lu
27c3de568c upd 上课时长记录埋点 2023-10-18 17:22:04 +08:00