hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-07 18:06:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,267 Commits 89 Branches 1 Tag
zcwy0729-llf
Commit Graph

1267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
joshen
71cc961e71 Merge branch '2024-03-25-mycat' into 'master' 
修改连接为mycat

See merge request !76
 2024-04-12 19:30:39 +08:00
zengguoqing1988
7b1d2248ae 修改连接为mycat 2024-04-12 18:18:20 +08:00
joshen
1ca04897aa Merge branch 'zcwy0307-jw' into 'master' 
Zcwy0307 jw

See merge request !75
 2024-03-08 13:34:39 +08:00
xiaozhequ
5fcbf0ed23 CourseFullTextApi代码恢复 2024-03-08 10:29:41 +08:00
xiaozhequ
03c59bf6c2 更改参数 2024-03-08 10:02:10 +08:00
xiaozhequ
6bc645efc5 从字典获取例外人员id 2024-03-08 09:33:24 +08:00
joshen
7dc3b35ae9 Merge branch 'zcwy0307-l' into 'master' 
例外人员固定

See merge request !74
 2024-03-07 13:57:30 +08:00
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
joshen
f635231bf0 Merge branch 'zcwy0110_jw' into 'master' 
修改课程页面的离职教师

See merge request !70
 2024-01-18 13:59:01 +08:00
xiaozhequ
0faed83c3d 修改课程页面的离职教师 2024-01-18 13:52:33 +08:00
joshen
30aa2a5f32 Merge branch 'zcwy0110_jw' into 'master' 
修改thirdapi的bug

See merge request !69
 2024-01-18 11:02:52 +08:00
xiaozhequ
822e6062ad 修改thirdapi的bug 2024-01-18 10:52:31 +08:00
joshen
6381aa0d05 Merge branch 'zcwy0110_jw' into 'master' 
替换离职人员信息2

See merge request !68
 2024-01-17 14:38:39 +08:00
xiaozhequ
e4a30e0282 替换离职人员信息2 2024-01-17 14:04:17 +08:00
joshen
96d4de62b9 Merge branch 'zcwy_yk' into 'master' 
案例搜索接口修改4

See merge request !67
 2024-01-11 18:13:55 +08:00
yang康1999
dfc8211103 案例搜索接口修改4 2024-01-11 18:13:04 +08:00
joshen
1e52d01bf0 Merge branch 'zcwy1128' into 'master' 
Zcwy1128

See merge request !66
 2023-12-27 14:14:45 +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
32871c7e58 Merge branch 'zcwy1128' into 'master' 
Zcwy1128

See merge request !62
 2023-11-29 16:43:21 +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
bc2972c73c Merge branch 'zcwy1124' into 'master' 
获取例外人员

See merge request !59
 2023-11-24 21:12:24 +08:00
joshen@zcwytd.com
9f0fb46bba 获取例外人员 2023-11-24 21:11:45 +08:00
joshen
2bb9fe47b3 Merge branch 'zcwy1124' into 'master' 
获取例外人员

See merge request !58
 2023-11-24 21:01:09 +08:00
joshen@zcwytd.com
bdd7395161 获取例外人员 2023-11-24 21:00:39 +08:00
joshen
aefdb7ba86 Merge branch 'zcwy1124' into 'master' 
获取例外人员 日志

See merge request !57
 2023-11-24 20:33:59 +08:00
joshen@zcwytd.com
92c1a38a4c 获取例外人员 日志 2023-11-24 20:33:38 +08:00
joshen
dab339b3a0 Merge branch 'zcwy1124' into 'master' 
获取例外人员 日志

See merge request !56
 2023-11-24 20:25:35 +08:00
joshen@zcwytd.com
849591d700 获取例外人员 日志 2023-11-24 20:25:07 +08:00
joshen
232f86c045 Merge branch 'zcwy1124' into 'master' 
获取例外人员 日志

See merge request !55
 2023-11-24 20:00:12 +08:00
joshen@zcwytd.com
1c1db72505 获取例外人员 日志 2023-11-24 19:59:45 +08:00
joshen
1abd87abfe Merge branch 'zcwy1124' into 'master' 
通过token获取userid

See merge request !54
 2023-11-24 18:52:33 +08:00
joshen@zcwytd.com
2f9c132e22 通过token获取userid 2023-11-24 18:51:59 +08:00
joshen
c7b35ebfba Merge branch 'zcwy1124' into 'master' 
Zcwy1124

See merge request !53
 2023-11-24 18:41:22 +08:00
joshen@zcwytd.com
8f62680021 Merge branch 'zcwy1124' of http://10.251.129.121/boeu/java-servers into zcwy1124 2023-11-24 18:39:48 +08:00
joshen@zcwytd.com
3bcc848b7c 加日志 2023-11-24 18:39:32 +08:00
joshen
e4cb8bbdf6 Merge branch 'zcwy1124' into 'master' 
判空加日志

See merge request !52
 2023-11-24 17:41:09 +08:00
joshen@zcwytd.com
339062748b 判空加日志 2023-11-24 17:40:18 +08:00
joshen
76e0287052 Merge branch 'zcwy1124' into 'master' 
判空

See merge request !51
 2023-11-24 17:33:43 +08:00
joshen@zcwytd.com
0b42013330 判空 2023-11-24 17:33:17 +08:00
joshen
66d833ef4e Merge branch 'zcwy1124' into 'master' 
判空

See merge request !50
 2023-11-24 17:17:41 +08:00
joshen@zcwytd.com
02c02c44cf 判空 2023-11-24 17:16:45 +08:00