Merge branch 'master-auto-pay' into dev

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

@@ -96,8 +96,8 @@ FROM
         SELECT
         ausw.*,
         aul.username AS `phone`,
-        IFNULL(aud.realname,aud.nickname) AS  `sourceName`,
-        IFNULL(audd.realname,audd.nickname) AS `userName`
+        IFNULL(aud.realname,aull.username) AS  `sourceName`,
+        IFNULL(audd.realname,aul.username) AS `userName`
         FROM
         ( SELECT * FROM `app_user_selling_water` WHERE 1 = 1
         <if test="status !=null">
@@ -124,10 +124,12 @@ FROM
             WHERE `username` = #{phone}
         </if>
         ) AS aul ON aul.id = ausw.user_id
+        INNER JOIN `app_user_login` AS `aull` ON aull.id=ausw.source_id
         INNER JOIN `app_user_detail` AS aud ON aud.userid = ausw.source_id
         INNER JOIN ( SELECT * FROM `app_user_detail`
         <if test="userName!=null and userName!=' '">
             WHERE `realname` LIKE CONCAT('%',#{userName},'%') OR `nickname` LIKE CONCAT('%',#{userName},'%')
         </if>) AS audd ON audd.userid = ausw.user_id
+      ORDER BY ausw.crt_time DESC
     </select>
 </mapper>
\ No newline at end of file