Merge branch 'dev' into 'master'

删除错误

See merge request !10

cloud-research-service/src/main/java/com/yizhi/research/application/mapper/ResearchMapper.xml

@@ -580,7 +580,7 @@
         where tb.site_id = #{siteId} 
         where tb.site_id = #{siteId} 
         <if test="bizType != null ">
         <if test="bizType != null ">
             and tb.biz_type = #{bizType}
             and tb.biz_type = #{bizType}
-        </if>)
+        </if>
         and tb.state = 1 and tb.top_up = 1 and tb.deleted = 0
         and tb.state = 1 and tb.top_up = 1 and tb.deleted = 0
         order by update_time DESC
         order by update_time DESC
 	</select>
 	</select>