1207 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
xiaozhequ	e38a9bc2c9	新建索引	2023-10-30 10:19:41 +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	4d634bae2f	Merge remote-tracking branch 'origin/zcwy0912' into zcwy0912	2023-10-20 10:50:28 +08:00
joshen@zcwytd.com	69e9f1c403	termsQuery	2023-10-20 10:49:47 +08:00
joshen@zcwytd.com	268dee1daf	Merge branch 'zcwy-master' into zcwy0912	2023-10-20 10:48:42 +08:00
joshen@zcwytd.com	2b5b883651	pom	2023-10-20 09:21:00 +08:00
xiaozhequ	249461dbaa	Merge branch 'xiaozhequ'	2023-10-20 09:15:08 +08:00
xiaozhequ	54df004ce5	Revert "解决查询不出例外人" ... This reverts commit 2cc74026bf. # Conflicts: # modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java	2023-10-20 09:14:50 +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