修改激活记录排序，显示账户用户名

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/ActivationRecordVO.java

@@ -27,7 +27,7 @@ public class ActivationRecordVO implements Serializable {
     private String materialName;
 
     @ApiModelProperty(value = "激活账号")
-    private String activeAccount;
+    private String userName;
 
     @ApiModelProperty(value = "激活时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ActivationRecordRes.java

@@ -48,7 +48,7 @@ public class ActivationRecordRes implements Serializable {
         private String materialName;
 
         @ApiModelProperty(value = "激活账号")
-        private String activeAccount;
+        private String userName;
 
         @ApiModelProperty(value = "激活时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrBoxMappingMapper.xml

@@ -129,7 +129,7 @@
 
     <select id="getActivationRecord" resultType="com.abi.qms.platform.dao.vo.result.ActivationRecordVO">
         select qbm.box_code,ba.active_name,bm.material_name,
-            qbm.active_time,ui.employee_no as activeAccount
+            qbm.active_time,ui.user_name
         from qr_box_mapping qbm
         left join qr_package qp on qbm.package_id=qp.id
         left join base_material bm on bm.id = qp.material_id
@@ -141,6 +141,7 @@
                 AND DATE_FORMAT(qbm.active_time,'%Y-%m') = #{req.month}
             </if>
         </where>
+        ORDER BY qbm.active_time DESC
     </select>
 
     <select id="getActivateDetail" resultType="com.abi.qms.platform.dao.vo.result.ActivateDetailVo">