Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

xx-activity/xx-activity-server/src/main/resources/mapper/UserCouponMapper.xml

@@ -104,9 +104,9 @@
     </select>
 
     <insert id="inserBatch">
-        INSERT INTO `user_coupon`(`user_id`,`coupon_id`,`start_time`,`expire_time`,`crt_time`) VALUES
+        INSERT INTO `user_coupon`(`user_id`,`coupon_id`,`ticker_no`,`start_time`,`expire_time`,`crt_time`) VALUES
        <foreach collection="userCoupons" item="userCoupon" separator=",">
-           (#{userCoupon.userId},#{userCoupon.couponId},#{userCoupon.startTime},#{userCoupon.expireTime},#{userCoupon.crtTime} )
+           (#{userCoupon.userId},#{userCoupon.couponId},#{userCoupon.tickerNo} ,#{userCoupon.startTime},#{userCoupon.expireTime},#{userCoupon.crtTime} )
        </foreach>
     </insert>