Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-10 9e3ba891ab4439760d33ff5c12b7405273d0ed95

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

@@ -28,6 +28,10 @@
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,@Param("userType") String userType);



    SysUser selectData(String userId);


    /**
     * 新增聊天记录
     *