Merge branch 'dev' into test

share-system/src/main/resources/mapper/system/MonthlyCardLogMapper.xml

@@ -71,7 +71,7 @@
         <if test="phone != null  and phone != ''">and l.phone = #{phone}</if>
         <if test="useDuration != null ">and l.use_duration = #{useDuration}</if>
         <if test="residueDuration != null ">and l.residue_duration = #{residueDuration}</if>
-        order by l.create_time
+        order by l.create_time desc
     </select>
 
     <select id="selectMonthlyCardLogById" parameterType="Long" resultMap="MonthlyCardLogResult">

share-system/src/main/resources/mapper/system/MonthlyCardOrderMapper.xml

@@ -98,6 +98,7 @@
         <if test="endDate != null">
             and DATE_FORMAT(o.create_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
         </if>
+        order by o.create_time desc
     </select>
 
     <select id="selectMonthlyCardOrderById" parameterType="Long" resultMap="MonthlyCardOrderResult">

share-system/src/main/resources/mapper/system/SecondaryCardOrderMapper.xml

@@ -97,6 +97,7 @@
         <if test="endDate != null">
             and DATE_FORMAT(o.create_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
         </if>
+        order by o.create_time desc
     </select>
 
     <select id="selectSecondaryCardOrderById" parameterType="Long" resultMap="SecondaryCardOrderResult">