Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-16 5ca8ff0110846078c80ac7e89b5e38bb8046c2a3

 flower_city/src/main/java/com/dg/core/service/ISysUserService.java

@@ -15,7 +15,7 @@
     * @return 参数配置信息
     */
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,
                                          String userName,List<String> ids);
                                          String userName,List<String> ids,String isDivisionHead);


    SysUser selectData(String userId,String phonenumber,String loginName);