Merge branch 'master-wallet-bug-fix' into dev

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

@@ -67,16 +67,10 @@ FROM
         ) 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
         ON o.order_no=w.order_no
         where 1=1
-        <choose>
-            <when test="wating!=null">
-                and `waiting`= #{wating}
-            </when>
-            <otherwise>
-                and  <![CDATA[
-                o.`type`<>1
-                ]]>
-            </otherwise>
-        </choose>
+            <if test="wating!=null">
+                and `waiting`= #{wating} and  <![CDATA[
+                o.`type`<>1 ]]>
+            </if>
         ORDER BY `crt_time`
     </select>
 </mapper>
\ No newline at end of file