Commit Graph

1152 Commits

Author SHA1 Message Date
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
joshen
4e268ffab7 Merge branch 'zcwy1124' into 'master'
暂时注释

See merge request !49
2023-11-24 16:47:15 +08:00
joshen@zcwytd.com
e08dad59eb 暂时注释 2023-11-24 16:45:52 +08:00
joshen
f2d8273f0f Merge branch 'zcwy1124' into 'master'
获取非报名课id

See merge request !48
2023-11-24 16:33:12 +08:00
joshen@zcwytd.com
2bd855a3ef 获取非报名课id 2023-11-24 16:32:52 +08:00
joshen
5e2e5cac3a Merge branch 'zcwy1124' into 'master'
加字段

See merge request !47
2023-11-24 16:28:57 +08:00
joshen@zcwytd.com
6f3a91687f 加字段 2023-11-24 16:28:25 +08:00
joshen
1b4d0a93cf Merge branch 'zcwy1124' into 'master'
更新查询

See merge request !46
2023-11-24 16:21:44 +08:00
xiaozhequ
6d3cd19292 更新查询 2023-11-24 16:18:48 +08:00
joshen
5b4feb45d6 Merge branch 'zcwy1110' into 'master'
邮箱@前三位

See merge request !45
2023-11-10 18:09:23 +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
6c030c72fb 课程受众权限暂时不上线 2023-10-30 19:24:12 +08:00
joshen@zcwytd.com
669f59c7d3 课程受众权限暂时不上线 2023-10-30 19:09:43 +08:00
joshen@zcwytd.com
89035f63fa Merge branch 'zcwy-master' into zcwy0912 2023-10-30 10:36:10 +08:00
xiaozhequ
754e65481a Merge branch 'xiaozhequ' 2023-10-30 10:19:54 +08:00