Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

# Conflicts:
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java
#	tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/couponItemMapper.xml

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/useIntegralMapper.xml

@@ -116,7 +116,7 @@
     </insert>
 
     <!-- 查询积分来源信息 -->
-    <select id="listIntegralConfig" parameterType="StayIntegral" resultType="StayIntegral">
+    <select id="listStayIntegral" parameterType="StayIntegral" resultType="StayIntegral">
         SELECT
             t.stay_id AS  stayId,
             t.user_openid AS  userOpenId,