Merge branch 'developer' into 'master'

投诉建议查询加上企业id

See merge request !8

gic-evaluate-service/src/main/resources/mapper/TabProblemMapper.xml

@@ -275,7 +275,6 @@
     select
     <include refid="Base_Column_List" />
     from tab_problem where enterprise_id = #{enterpriseId}
-    <where>
     <if test="null != problemIds and problemIds.length &gt; 0">
       and problem_id in
       <foreach close=")" collection="problemIds" index="index" item="item" open="(" separator=",">
@@ -305,8 +304,6 @@
       <if test="endTime != null and endTime != '' ">
           and create_time &lt;= #{endTime}
       </if>
-
-    </where>
     order by create_time desc
   </select>
   <select id="countProblem" resultType="int">