Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/mapping/help/AppPageNotificationMapper.xml

@@ -33,7 +33,7 @@
      from yeshi_ec_apppage_notification where an_type = #{0}

   </select>



   <select id="selectValidByType" resultMap="BaseResultMap" parameterType="java.lang.String">

   <select id="listValidByType" resultMap="BaseResultMap" parameterType="java.lang.String">

      SELECT <include refid="Base_Column_List" /> FROM yeshi_ec_apppage_notification 

      WHERE an_type = #{0} AND an_show = 1 

          AND IF(an_begin_time IS NULL,TRUE, an_begin_time<![CDATA[<=]]> NOW())