Commit Graph

1149 Commits

Author SHA1 Message Date
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
lu
f40005d2aa upd 案例添加修改 2023-10-18 16:19:29 +08:00
joshen@zcwytd.com
738ca9640e Merge branch 'zcwy-master' into zcwy0912 2023-10-18 13:25:25 +08:00
xiaozhequ
b3ebc93769 10/17 添加未提交文件 2023-10-18 13:22:34 +08:00
joshen@zcwytd.com
8311320b8d Merge branch 'zcwy-master' into zcwy0912 2023-10-18 13:16:40 +08:00
xiaozhequ
2cadef267c Merge branch 'xiaozhequ'
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
#	servers/boe-server-all/src/main/resources/application.properties
2023-10-18 11:43:21 +08:00
xiaozhequ
367b0d05ea 10/18 添加工号配置 受众权限 2023-10-18 11:39:28 +08:00
xiaozhequ
a4c67fc52e 10/17 2023-10-17 20:44:10 +08:00
joshen@zcwytd.com
a6df89f51b Merge branch 'zcwy-master' into zcwy0912 2023-10-17 20:03:19 +08:00
lu
d9687bd6f5 添加参数 2023-10-17 19:55:48 +08:00
joshen@zcwytd.com
a7ee6c7243 Merge branch 'zcwy-master' into zcwy0912 2023-10-17 19:39:59 +08:00
lu
5d46f86439 upd 埋点接口调整 2023-10-17 11:33:29 +08:00
lu
b46d903d38 添加注释 2023-10-17 10:42:37 +08:00
lu
68dd9897ab 未提交文件 2023-10-17 10:14:23 +08:00
lu
d0f2e0ab64 未提交文件 2023-10-17 10:13:29 +08:00
lu
0b24f65cee add 添加未提交文件 2023-10-17 10:12:58 +08:00
lu
fcc77f08d8 add 案例分类添加功能 2023-10-17 10:12:08 +08:00
lu
af12ca604f add cases字段注解 2023-10-16 18:24:03 +08:00
lu
14f25dcc6b add 案例添加三级种类查询 2023-10-16 18:11:22 +08:00
joshen@zcwytd.com
2d081e645b Merge branch 'zcwy-master' into zcwy0912 2023-10-13 10:24:44 +08:00
670788339
b5f4ee43f8 默认配置文件dev 2023-10-11 17:27:53 +08:00
670788339
4f1a71f740 tree-list接口增加返回值 2023-10-11 17:20:53 +08:00
joshen@zcwytd.com
f6c86c7f83 Merge branch 'cloud' into xingao_0921 2023-09-22 14:37:39 +08:00