diff --git a/Document/数智创新中心研发情况汇报V1.1.pptx b/Document/数智创新中心研发情况汇报V1.2.pptx similarity index 99% rename from Document/数智创新中心研发情况汇报V1.1.pptx rename to Document/数智创新中心研发情况汇报V1.2.pptx index d735d584..a6e816ea 100644 Binary files a/Document/数智创新中心研发情况汇报V1.1.pptx and b/Document/数智创新中心研发情况汇报V1.2.pptx differ diff --git a/dsBaseRpc/Sql/t_base_teacher.sql b/dsBaseRpc/Sql/t_base_teacher.sql index 62983719..3b61ae57 100644 --- a/dsBaseRpc/Sql/t_base_teacher.sql +++ b/dsBaseRpc/Sql/t_base_teacher.sql @@ -31,5 +31,5 @@ case t1.`b_use` when -2 then 1 else 0 end AS `del_flag`, `t_base_organization`.`xxbxlxm` AS `xxbxlxm`, `t_base_organization`.`szdcxlxm` AS `szdcxlxm` from (`t_base_teacher` as t1 inner join `t_base_teacher_org` as t2 on t1.person_id=t2.person_id and t2.b_use=1 and t2.is_main=1 join `t_base_organization` on (t2.`org_id` = `t_base_organization`.`org_id`)) -where t1.identity_id=2 +where t1.identity_id in (1,2) ) as t1 \ No newline at end of file diff --git a/dsSso/Config/Config.ini b/dsSso/Config/Config.ini index 960421b0..e5425af1 100644 --- a/dsSso/Config/Config.ini +++ b/dsSso/Config/Config.ini @@ -24,7 +24,7 @@ KafkaAccessLogTopic = dsAccessLog # ---------------------------------------------------------------------------------------------------- [server] #gin服务器的端口 -port = 80 +port = 8000 # 验证码的有效时间,单位:秒 CaptchaExpireTime = 120