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

admin

2019-08-26 6009c2c07cd32a76b32c8d63a5a017be695c5ea5

 fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralTaskRecordMapper.xml

@@ -146,9 +146,16 @@

      AND DATE_SUB(CURDATE(), INTERVAL 7 DAY) <![CDATA[<=]]>
      DATE(d.ir_create_time)
      ORDER BY d.ir_create_time desc
      ORDER BY d.ir_create_time desc

   </select>





   <select id="listSignRecordByDateTime" resultMap="BaseResultMap">

      SELECT * FROM yeshi_ec_integral_task_record d

      WHERE d.`ir_uid` = #{uid} and d.ir_cid=#{cid}

      AND d.ir_create_time <![CDATA[<=]]> #{dateTime}

      ORDER BY d.ir_create_time desc

   </select>

   <select id="countTotalGoldCoin" resultType="Integer">
      SELECT