Merge branch 'master' of 10.10.14.250:huanghai/dsMin

master
wubin 5 years ago
commit e903bcbee7

@ -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

@ -24,7 +24,7 @@ KafkaAccessLogTopic = dsAccessLog
# ----------------------------------------------------------------------------------------------------
[server] #gin服务器的端口
port = 80
port = 8000
# 验证码的有效时间,单位:秒
CaptchaExpireTime = 120

Loading…
Cancel
Save