Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-15 d7c3b9d46cc331cfc57446d77c44e4c138addd72

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

@@ -17,7 +17,7 @@
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType);


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

    /**
     * 新增聊天记录