Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-09-29 13db271c8d35d8730c8daf6d359c1fa352f52cd8

 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -97,6 +97,11 @@
        order by create_time desc
    </select>

    <select id="selectListByDepartmentId"  resultMap="SysUserResult">
        <include refid="selectSysUserVo"/>
         where department_id=#{departmentId} and master_ids like concat('%',#{classifyId}, '%')
    </select>


    <insert id="insertConfig" parameterType="com.dg.core.db.gen.entity.SysUser">
        insert into automessage_sys_user (