Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-14 eddca9819968d95ca160720e778f10e85b921627

 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);

    /**
     * 新增聊天记录