Merge branch 'dev-1.1.0'

Author: zqburde

dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/dao/DSSWorkspaceUserMapper.java

@@ -59,7 +59,7 @@ void setUserRoleInWorkspace(@Param("workspaceId") int workspaceId, @Param("roleI
             "<script>",
             "select distinct created_by as creator, username as username, create_time as joinTime,workspace_id as workspaceId " +
                     "from dss_workspace_user_role where workspace_id = #{workspaceId} ",
-            "<if test='username != null'>and username=#{username}</if> order by id desc",
+            "<if test='username != null'>and username=#{username}</if> ",
             "</script>"
     })
     List<DSSWorkspaceUser> getWorkspaceUsers(@Param("workspaceId") String workspaceId,@Param("username") String username);