Merge remote-tracking branch 'origin/feature/1113-vipCourse' into feature/1113-vipCourse

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderDetailMapper.xml

@@ -50,6 +50,7 @@
         , t.update_time_ as updateTime
         , t.biz_json_ as bizJson
         , t.gift_flag_ as giftFlag
+        , t.discount_json_ as discountJson
         </sql>
 
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo">