Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-08 03a1169c1fb7a066caedfa0c86b00184ba74d1ce

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml

@@ -18,4 +18,8 @@
              inner join t_dept c on a.deptId = c.DEPT_ID
                ${ew.customSqlSegment}
    </select>

    <select id="getDictType" resultType="cc.mrbird.febs.common.core.entity.system.DicItem">
        select * from t_dicitem where dicCode=#{type}
    </select>
</mapper>