Merge remote-tracking branch 'origin/dev' into dev

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

@@ -64,8 +64,9 @@ FROM
         AND `status`=1 and commission>0
         ) as t
         GROUP BY t.order_no
-        ) o LEFT JOIN ( SELECT DISTINCT order_no,user_id,source_id,order_type,img,price,title,waiting,`crt_time` FROM
-        app_user_selling_water ) w
+        ) o LEFT JOIN ( SELECT order_no,user_id,source_id,order_type,img,price,title,waiting,`crt_time` FROM
+        app_user_selling_water WHERE
+        id IN ( SELECT MAX( id ) FROM app_user_selling_water GROUP BY order_no)) w
         ON o.order_no=w.order_no
         where 1=1
         <if test="wating!=null">