Skip to content

C
cloud-platform
Commit 36cf4836 authored by libin's avatar libin
Browse files
Options

Merge branch '2019-11-15-vehicle' into dev

parents f0a56bad 7bd29df6
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
ace-modules/ace-admin/src/main/resources/mapper/AppUserSellingWaterMapper.xml
View file @ 36cf4836
...@@ -82,7 +82,7 @@ FROM ...@@ -82,7 +82,7 @@ FROM
and `waiting`= #{wating} and <![CDATA[ and `waiting`= #{wating} and <![CDATA[
o.`type`<>1 ]]> o.`type`<>1 ]]>
</if> </if>
ORDER BY `crt_time` ORDER BY `crt_time` DESC
</select> </select>
<select id="selectSellingWaterPage" <select id="selectSellingWaterPage"
resultType="com.github.wxiaoqi.security.admin.dto.UserSellingWaterAdminDTO"> resultType="com.github.wxiaoqi.security.admin.dto.UserSellingWaterAdminDTO">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment