Merge remote-tracking branch 'origin/master'

wisenergy-mapper/src/main/resources/mapper/TradeRecordMapper.xml

@@ -116,7 +116,7 @@
         and date_format(create_time,'%Y-%m') >= date_format(now() - interval 7 month,'%Y-%m')
         and (status=1 or status=3)
         and user_id=#{userId}
-        group by user_id ,create_time desc;
+        group by user_id ,create_time;
     </select>
 
     <select id="getWithdrawalRecord" resultType="cn.wisenergy.model.vo.WithdrawalRecordVo">