Merge branch 'feature-bieao' of lift-manager/lift-server into develop

lift-business-service/src/main/resources/mapper/project/ProjectUserMapper.xml

@@ -42,8 +42,8 @@
 		FROM project_user pu
 			 LEFT JOIN user_info ui ON pu.user_id = ui.user_id
 		WHERE 1=1
-		<if test="projectId!=null and projectId!=''">
-			AND project_id = #{projectId,jdbcType=BIGINT}
+		<if test="id!=null and id!=''">
+			AND project_id = #{id,jdbcType=BIGINT}
 		</if>
 		<if test="mtCompanyId!=null and mtCompanyId!=''">
 			AND mt_company_id = #{mtCompanyId,jdbcType=BIGINT}