Commit Graph

975 Commits

Author SHA1 Message Date
joshen@zcwytd.com
69e9f1c403 termsQuery 2023-10-20 10:49:47 +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
acbdf97c7a Merge branch 'xiaozhequ'
# Conflicts:
#	modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java
2023-10-19 23:25:24 +08:00
xiaozhequ
6e75d8b08a Merge remote-tracking branch 'origin/master' 2023-10-19 23:24:29 +08:00
xiaozhequ
2cc74026bf 解决查询不出例外人 2023-10-19 23:24:14 +08:00
xiaozhequ
a918f612c5 解决查询不出例外人 2023-10-19 23:15:15 +08:00
joshen@zcwytd.com
73a9649715 Merge branch 'zcwy-master' into zcwy0912 2023-10-19 16:18:47 +08:00
xiaozhequ
d2d2862af6 Merge branch 'xiaozhequ' 2023-10-19 16:05:32 +08:00
xiaozhequ
acccac4d6e 增加判断条件 2023-10-19 16:05:12 +08:00
joshen@zcwytd.com
9163766730 Merge branch 'zcwy-master' into zcwy0912 2023-10-19 15:09:17 +08:00
xiaozhequ
a6b4b2c06f Merge branch 'xiaozhequ' 2023-10-19 14:58:52 +08:00
xiaozhequ
9d056889b3 修改查询条件 2023-10-19 14:55:36 +08:00
joshen@zcwytd.com
4d77462185 Merge branch 'zcwy-master' into zcwy0912 2023-10-18 19:39:02 +08:00
xiaozhequ
4ec8afc904 Merge branch 'xiaozhequ' 2023-10-18 19:33:58 +08:00
xiaozhequ
596f7a3e25 加入例外人员为空的判断 2023-10-18 19:32:51 +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
a109f84aa3 配置文件 2023-09-20 18:05:17 +08:00
joshen@zcwytd.com
564888349a 配置文件 2023-09-20 17:47:56 +08:00
joshen@zcwytd.com
5e94763731 案例推送组织接收参数修改 2023-09-19 14:03:37 +08:00
joshen@zcwytd.com
73fa66c673 案例推荐-发起推送 调用用户中心接口更改补充提交 2023-09-12 10:41:02 +08:00
joshen@zcwytd.com
bac127a22b 案例推荐-发起推送 调用用户中心接口更改 2023-09-12 10:32:04 +08:00
joshen
0bfc7dd661 Merge branch 'up_master' into 'master'
Up master

See merge request !15
2023-09-01 17:53:26 +08:00
joshen
ccca881ee9 Merge branch 'cloud' into 'up_master'
Cloud

See merge request !14
2023-09-01 17:49:08 +08:00
BOE\10867418
2374fa7d5a Merge branch 'cloud' into old-cloud 2023-09-01 17:11:03 +08:00
daihh
94468c07cf 去掉课程查询的调试打印日志 2023-09-01 15:33:28 +08:00
daihh
17b8498642 修正获取权限组织id集合读取时未去掉引号的问题 2023-09-01 15:24:51 +08:00
daihh
170a42e72c 增加测试 2023-09-01 14:48:08 +08:00