Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml

@@ -490,4 +490,10 @@
      WHERE `state` = 1 AND worker_id = #{0}  order by id desc
   </select>

   <select id="getSuccessByDate" resultMap="AllResultMap" >
      SELECT * FROM yeshi_ec_threesale t
      WHERE t.`boss_id` = #{bossId} AND t.`state` = 1
          AND  <![CDATA[t.createTime >= #{minTime} AND t.createTime <= #{maxTime}]]>
   </select>
	
</mapper>