Merge branch 'develop' of https://gitea.rk-health.com/renkang/xj-platform into develop

health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/ConNoticeMapper.java

@@ -24,7 +24,7 @@ public interface ConNoticeMapper extends BaseMapper<ConNotice> {
      */
     IPage<ConNotice> queryPageList(IPage<ConNotice> page, @Param("conNotice") ConNotice conNotice);
 
-    @Select("SELECT * FROM con_notice WHERE status = '1' and del_flag = '0' and type = #{noticeType} order by create_time desc limit 1")
+    @Select("SELECT * FROM con_notice WHERE status = '1' and del_flag = '0' and notice_type = #{type} order by create_time desc limit 1")
     public ConNotice selectNoticeByType(String type);
 
 }