lyhzzz пре 2 година
родитељ
комит
1ea54914ed

+ 2 - 0
src/main/java/com/fdkankan/manage/vo/response/CameraDetailVo.java

@@ -17,5 +17,7 @@ public class CameraDetailVo {
     private String companyName;         //客户名称
     private String userName;            //绑定账号
 
+    private String orderSn;
+
 
 }

+ 2 - 1
src/main/resources/mapper/manage/CameraMapper.xml

@@ -3,7 +3,8 @@
 <mapper namespace="com.fdkankan.manage.mapper.ICameraMapper">
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.CameraDetailVo">
-        select c.id ,c.sn_code,c.activated_time ,d.create_time as outTime ,d.type,d.own as outType ,co.company_name ,u.user_name, c.wifi_name
+        select c.id ,c.sn_code,c.activated_time ,d.create_time as outTime ,d.type,d.own as outType ,co.company_name ,u.user_name, c.wifi_name,
+        d.order_sn
         from t_camera c
         left join t_camera_detail d on c.id = d.camera_id
         left join t_company co on d.company_id = co.id

+ 0 - 1
src/main/resources/mapper/manage/NewsMapper.xml

@@ -8,7 +8,6 @@
     n.`title`,
     n.`source`,
     n.`new_type`,
-    m.`nickname`,
     n.`create_time`,
     n.`public_time`,
     n.`display`,