Merge branch 'dev' of https://git.yingcaibx.com/tl/api into dev

src/main/java/com/xjrsoft/module/outint/controller/TeacherOutInRecordController.java

@@ -71,7 +71,6 @@ public class TeacherOutInRecordController {
                         ext->ext.selectAs(XjrUser::getCredentialNumber, TeacherOutInRecordPageVo::getIdentityCard)
                         .selectAs(XjrUser::getMobile,TeacherOutInRecordPageVo::getPhone)
                         .select(XjrUser::getName))
-                .leftJoin("xjr_dictionary_detail t2 ON (t2.code = t1.gender) and t2.item_id = ")
                 .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode, XjrUser::getGender, ext->ext.selectAs(DictionaryDetail::getName, TeacherOutInRecordPageVo::getGender));
 
         if(ObjectUtil.isNotNull(dto.getDeptId()) && dto.getDeptId() != 0){