2

src/main/java/com/ycwl/basic/model/mobile/scenic/content/ContentPageVO.java

@@ -33,4 +33,5 @@ public class ContentPageVO {
     @ApiModelProperty("是否购买：0未购买，1已购买")
     private Integer isBuy;
     private BigDecimal duration;
+    private Integer goodsType;
 }

src/main/java/com/ycwl/basic/model/mobile/statistic/resp/AppStatisticsFunnelVO.java

@@ -13,7 +13,8 @@ import lombok.Data;
 public class AppStatisticsFunnelVO {
 
     @ApiModelProperty("镜头检测游客数")
-    private Integer cameraShotOfMemberNum;
+//    private Integer cameraShotOfMemberNum;
+    private String cameraShotOfMemberNum;
     @ApiModelProperty("镜头检测游客数_扫码访问人数_转化率")
     private String csom_scaom;
     @ApiModelProperty("扫码访问人数")

src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceConfigEntity.java

@@ -15,6 +15,7 @@ public class DeviceConfigEntity {
      * 设备id
      */
     private Long deviceId;
+    private Integer viidType;
     /**
      * 启用时间
      */

src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java

@@ -31,6 +31,7 @@ public class OrderItemVO {
     @ApiModelProperty("商品ID，goods_type=1关联video.id，=2关联source.id")
     private Long goodsId;
     private Long faceId;
+    private String faceUrl;
     @ApiModelProperty("景区名称")
     private String scenicName;
     @ApiModelProperty("商品名称 模版名称/原片x个/照片x个")