Merge branch 'wallet_detail' into dev

ace-modules/ace-admin/src/main/resources/mapper/MyWalletDetailMapper.xml

@@ -16,11 +16,11 @@
         wd.crt_time AS `crtTime`,
         aul.username AS `phone`,
         aud.nickname,
-        aud.realname<!--,
+        aud.realname,
         ausw.price,
         ausw.extract,
         ausw.waiting,
-        ausw.title-->
+        ausw.title
         FROM
         (select id,user_id,source,amount,`with_draw_order_no`,cono,itype,activity_id,activity_name,`crt_time` FROM
         `my_wallet_detail` WHERE 1=1
@@ -48,8 +48,8 @@
             test="userName != null and userName != ''">
         WHERE `nickname`=#{userName} OR `realname`=#{userName}
     </if>) AS `aud` ON aud.userid = aul.id
-        <!-- LEFT JOIN (SELECT DISTINCT order_id,id,price,extract,waiting,title FROM `app_user_selling_water`) AS `ausw` ON
-         ausw.order_id = wd.cono-->
+         LEFT JOIN (SELECT DISTINCT order_id,id,price,extract,waiting,title FROM `app_user_selling_water`) AS `ausw` ON
+         ausw.order_id = wd.cono
         ORDER BY `crtTime` DESC
     </select>