Merge remote-tracking branch 'origin/master'

bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOGoods.java

@@ -34,8 +34,6 @@ public class DTOGoods {
     private String facilityStatic;        //设备状态
     private Integer delId;                //删除状态
 
-
-
     //商品类型名称
     private String typeName;
 

bwie-common/src/main/java/com/bwie/common/pojo/Facility.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
+
 /**
  * @author FangShiBa
  * @date 2023/12/17
@@ -24,5 +25,4 @@ public class Facility {
     private String facilityStatic;        //设备状态
     private Integer delId;                //删除状态
 
-
 }

bwie-common/src/main/java/com/bwie/common/pojo/Shop.java

@@ -5,36 +5,21 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
-<<<<<<< HEAD
+
 /**
  * @author FangShiBa
  * @date 2023/12/17
  * @apiNote
  */
-=======
->>>>>>> origin/master
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @ToString
 public class Shop {
-<<<<<<< HEAD
     private Integer shopId;        //商品id
     private String shopName;       //商品名称
     private Double shopPrice;      //商品价格
     private Integer typeId;        //商品类型id
-=======
-
-    //商品id
-    private Integer shopId;
-    //商品名称
-    private String shopName;
-    //商品价格
-    private double shopPrice;
-    //商品类型id
-    private Integer typeId;
-
-
->>>>>>> origin/master
 
 }

bwie-common/src/main/java/com/bwie/common/pojo/VO/VOGoods.java

@@ -5,20 +5,18 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 
-<<<<<<< HEAD
+
 /**
  * @author FangShiBa
  * @date 2023/12/17
  * @apiNote
  */
-=======
->>>>>>> origin/master
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @ToString
 public class VOGoods {
-<<<<<<< HEAD
     private Integer goodsId;        //商品设备中间id
     private Integer shopId;         //商品id
     private Integer facilityId;     //设备id
@@ -28,23 +26,5 @@ public class VOGoods {
 
     private Integer pageNum=1;
     private Integer pageSize=3;
-=======
 
-    //商品设备中间id
-    private Integer goodsId;
-    //商品id
-    private Integer shopId;
-    //设备id
-    private Integer facilityId;
-    //库存
-    private Integer goodsNum;
-    //上下架(逻辑字段: 0上架, 1下架)
-    private Integer goodsIsDelete;
-
-    //分页
-    private Integer pageNum=1;
-    private Integer pageSize=3;
-
-
->>>>>>> origin/master
 }