Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-17 b69d2017fecdad6a1c9a09c0006e70ecea9efed0

 flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java

@@ -18,6 +18,7 @@
public interface SysUserMapper extends BaseMapper<SysUser> {

    SysUser getUserById(Long id);

    SysUser getUserByAccount(String account);

    /**
@@ -26,6 +27,10 @@
     * @return 参数配置信息
     */
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,@Param("userType") String userType);



    SysUser selectData(@Param("userId") String userId,@Param("phonenumber") String phonenumber);


    /**
@@ -66,4 +71,12 @@
     * @return 结果
     */
    List<SysUser> selectListByDepartmentId(@Param("list") List<String> list,@Param("classifyIdFront") String classifyIdFront,@Param("classifyIdAfter") String classifyIdAfter);


    /**
     * 查询用户列表（不分页）
     * @param userType 用户类型
     * @return 结果
     */
    List<SysUser>  queryList(@Param("userType") Integer userType);
}