Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-business/src/main/resources/mapper/TBDeviceInOutMapper.xml

@@ -93,7 +93,7 @@
                 </choose>
             </if>
         </where>
-        ORDER BY tbs.id DESC,tbdio.in_out_time
+        ORDER BY tbs.id DESC,tbdio.in_out_time DESC
     </select>
     <select id="findDeviceInOutPageBySource" resultType="com.qmth.sop.business.bean.result.DeviceInOutResult">
         SELECT
@@ -187,7 +187,7 @@
                 </choose>
             </if>
         </where>
-        ORDER BY tbs.id DESC,tbdio.in_out_time
+        ORDER BY tbs.id DESC,tbdio.in_out_time DESC
     </select>
     <select id="findDeviceCanOutInfo" resultType="com.qmth.sop.business.bean.result.DeviceInOutResult">
         SELECT