Merge remote-tracking branch 'origin/会员关联项目' into 会员关联项目

# Conflicts:
#	fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -566,8 +566,7 @@
         FROM
         fs_user
         left join fs_user_company_user ucu on ucu.user_id = fs_user.user_id
-        <where>
-            fs_user.is_del = 0
+        where fs_user.is_del = 0
             <if test="userId != null">
                 AND fs_user.user_id = #{userId}
             </if>
@@ -598,7 +597,6 @@
             <if test="projectId != null">
                 AND ucu.project_id = #{projectId}
             </if>
-        </where>
         limit ${(pageNum-1)*pageSize},${pageSize}
     </select>