lyhzzz hai 1 ano
pai
achega
03c3207427

+ 1 - 1
src/main/java/com/fdkankan/agent/response/LogListVo.java

@@ -50,7 +50,7 @@ public class LogListVo {
         switch (type){
             case 0 :return "专业会员(年)";
             case 1 :return "高级会员(月)";
-            case 2 :return "场景下载";
+            case 2 :return "场景下载(次)";
         }
         return typeStr;
     }

+ 4 - 2
src/main/java/com/fdkankan/agent/response/LogListVoEn.java

@@ -30,8 +30,8 @@ public class LogListVoEn {
     @ExcelProperty("Email")
     private String email;
 
-    @ExcelProperty("Methods")
-    private String giveTypeStr;
+    @ExcelProperty("Authorizer")
+    private String agentName;
 
     @ExcelProperty("Authorized Quantity")
     private Integer count;
@@ -42,6 +42,8 @@ public class LogListVoEn {
     @ExcelProperty("Total duration of the authorization (year/month)")
     private String totalTimeStr;
 
+    @ExcelProperty("Methods")
+    private String giveTypeStr;
 
     public String getTypeStr() {
         if(type == null){

+ 1 - 1
src/main/resources/mapper/agent/CameraMapper.xml

@@ -36,7 +36,7 @@
             </foreach>
         </if>
 
-        order by d.out_time desc
+        order by d.out_time desc,d.id desc
     </select>
     <select id="getBySnCodeAndAgentId" resultType="com.fdkankan.agent.entity.Camera">
         select c.* from t_camera c left join t_camera_detail d on c.id = d.camera_id