Merge branch 'dev_v1_1_20220720'

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

@@ -49,6 +49,7 @@
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo">
         SELECT
             <include refid="baseColumns"/>,
+                o.order_client_ as orderClient,
                 o.user_id_ as userId,
                 o.recom_user_id_ as recomUserId
         FROM user_order_detail t
@@ -58,6 +59,7 @@
     <select id="detailByOrderNo" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo">
         SELECT
             <include refid="baseColumns"/>,
+            o.order_client_ as orderClient,
             o.user_id_ as userId,
             o.recom_user_id_ as recomUserId
         FROM user_order_detail t
@@ -68,6 +70,8 @@
     <sql id="selectSql">
         SELECT
             <include refid="baseColumns" />,
+            o.order_client_ as orderClient,
+            o.user_id_ as userId,
             o.recom_user_id_ as recomUserId
         FROM user_order_detail t
         left join user_order o on t.order_no_ = o.order_no_