Commit Graph

1141 Commits

Author SHA1 Message Date
joshen
94c66ccd69 Merge branch 'zcwy0912' into 'master'
配置文件

See merge request !21
2023-09-20 18:05:46 +08:00
joshen@zcwytd.com
a109f84aa3 配置文件 2023-09-20 18:05:17 +08:00
joshen
bbb3d192f7 Merge branch 'zcwy0912' into 'master'
配置文件

See merge request !20
2023-09-20 17:48:25 +08:00
joshen@zcwytd.com
564888349a 配置文件 2023-09-20 17:47:56 +08:00
joshen
755713f6ee Merge branch 'zcwy0912' into 'master'
Zcwy0912

See merge request !19
2023-09-20 15:09:02 +08:00
daihh
436088db01 去掉一些日志打印,课程查询增加enabled ,是否启用的条件字段 2023-09-20 10:06:57 +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
daihh
a957ca14b5 学习记录查询的,加上姓名匹配字段 2023-09-04 10:02:24 +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
daihh
44221e65c0 加打印日志 2023-09-01 10:45:29 +08:00
daihh
43961699cb 修改打印日志 2023-09-01 09:40:45 +08:00
daihh
45fb80a8e3 修改打印的日志 2023-09-01 09:18:53 +08:00
daihh
bae236fc3e 课程资源归属查询匹配规则当前只MainList数组匹配。修改为 Main List和Readonly List 两个数组的合集。 2023-09-01 09:05:16 +08:00
449427055
0b210472d9 Merge branch 'fix_yjc_0821' into 'master'
修改配置文件

See merge request !13
2023-08-21 17:28:11 +08:00
yujicun
955d80444f 修改配置文件 2023-08-21 17:27:17 +08:00
449427055
b2f8d7f255 Merge branch 'fix_yjc_0821' into 'master'
Fix yjc 0821

See merge request !12
2023-08-21 17:10:41 +08:00
yujicun
50163aa0dc 修改日志 2023-08-21 17:07:07 +08:00
yujicun
5ded38c0fd 添加日志 2023-08-21 16:58:16 +08:00
BOE\10867418
1c864de6eb Merge branch 'cloud' 2023-08-15 16:33:13 +08:00
daihh
fda67f26bf ids人员调用时,空的问题处理 2023-08-15 16:30:49 +08:00
BOE\10867418
e2082b7d94 Merge branch 'dev0731' 2023-08-15 16:09:28 +08:00
BOE\10867418
30f774e4c3 Merge branch 'cloud' into dev0731 2023-08-15 16:08:00 +08:00
daihh
713eedd184 教师查询除了根据名称,同时增加员工号查询 2023-08-15 16:02:13 +08:00
yujicun
7579ae4e3d Merge remote-tracking branch 'boe/dev0731' into dev0731 2023-08-15 13:26:55 +08:00
yujicun
f823f2191f Merge remote-tracking branch 'origin/cloud' into dev0731 2023-08-15 13:26:04 +08:00
daihh
fa2ebc463d 课程审核, 无人员信息时,查询hrbp的相关调整 2023-08-15 11:32:33 +08:00
daihh
2a845e1856 查询试题,增加一个日志 2023-08-10 14:34:38 +08:00
joshen
39ac8303db Merge branch 'dev0731' into 'master'
Dev0731

See merge request !11
2023-08-09 20:07:50 +08:00
lims1@hunktimes.com
c37819d6b0 课程受众权限调整 2023-08-09 19:31:10 +08:00
lims1@hunktimes.com
50c5353139 课程受众权限日志 2023-08-09 19:23:50 +08:00
lims1@hunktimes.com
d410d7bb7e 课程受众权限日志 2023-08-09 19:18:52 +08:00
lims1@hunktimes.com
c24991eaa4 课程受众权限 2023-08-09 18:56:21 +08:00
lims1@hunktimes.com
91784a0a95 课程受众权限 2023-08-09 16:47:45 +08:00
449427055
ea0a30b3dd Update application-pro.properties 2023-08-08 22:14:00 +08:00
joshen
ee91e68c88 Merge branch 'dev0731' into 'master'
Dev0731

See merge request !10
2023-08-08 18:57:07 +08:00
lims1@hunktimes.com
09caa2546f 日志级别 2023-08-08 18:37:24 +08:00
lims1@hunktimes.com
befeaaefea 课程-无权限也可搜索 2023-08-08 11:50:21 +08:00
lims1@hunktimes.com
23a02a1355 Merge remote-tracking branch 'origin/dev0731' into dev0731 2023-08-08 11:41:41 +08:00
lims1@hunktimes.com
eeeb17a4ce 课程-无权限也可搜索 2023-08-08 11:41:06 +08:00
yujicun
76d80bcf1c Merge remote-tracking branch 'boe/dev0731' into dev0731 2023-08-08 11:18:54 +08:00
yujicun
d716aaf9b0 合并解决冲突 2023-08-08 11:18:20 +08:00
yujicun
2cf6362004 Merge remote-tracking branch 'boe/cloud' into cloud 2023-08-08 11:15:24 +08:00
lims1@hunktimes.com
b42284b511 课程受众-例外 boe_study_course 取值 2023-08-08 10:19:39 +08:00