Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml

@@ -208,8 +208,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{item}
             </foreach>
         </if>
+            <!--
             and ( (existing_problem is not null and existing_problem not like '暂无%' and existing_problem not like '无%' and length(trim(existing_problem))>0 )
             or (problem_progress IS NOT NULL AND problem_progress NOT LIKE '暂无%' AND problem_progress NOT LIKE '无%' AND LENGTH(TRIM(problem_progress))>0 ))
+            -->
             group by project_id
         )
     ) s LEFT JOIN sur_project AS p ON s.project_id=p.id order by p.projectSort