Commit 1184b036 authored by 陈明豪's avatar 陈明豪

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

parents b24f6453 a636dada
...@@ -168,10 +168,10 @@ ...@@ -168,10 +168,10 @@
vi.create_date desc vi.create_date desc
</if> </if>
<if test="entity.sort == '1'.toString()"> <if test="entity.sort == '1'.toString()">
F_GET_PYJM(vi.user_name) vi.create_date
</if> </if>
<if test="entity.sort == '2'.toString()"> <if test="entity.sort == '2'.toString()">
vi.visit_real_time vi.visit_date
</if> </if>
</if> </if>
</select> </select>
......
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