Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_java

src/main/resources/mapper/artificer/OrdersDao.xml

@@ -1194,10 +1194,11 @@
 
     <select id="getChongzhiList" resultType="com.sqx.modules.artificer.entity.Orders">
         select
-        o.*,uu.user_recharge as userRecharge
+        o.*,uu.user_recharge as userRecharge,b.massage_img
         from orders o
         left join artificer a on a.artificer_id=o.artificer_id
         left join user_recharge uu on uu.orders_id = o.orders_id
+        left join massage_type b on o.massage_type_id = b.massage_type_id
         where o.artificer_id=#{userId} and o.parent_id = 0
         and o.status in (3,5)
         and o.end_times BETWEEN #{startTime} and #{endTime}