FiveTeam
/
ShopManage
3
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

解决冲突

master
fangzhe 2023-12-19 16:57:16 +08:00
parent 4aa014098e
commit 155705ba83
3 changed files with 4 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,22 +5,18 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.ToString; import lombok.ToString;
<<<<<<< HEAD
/** /**
* @author FangShiBa * @author FangShiBa
* @date 2023/12/17 * @date 2023/12/17
* @apiNote * @apiNote
*/ */
=======
import java.util.List;
>>>>>>> origin/master
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@ToString @ToString
public class DTOGoods { public class DTOGoods {
<<<<<<< HEAD
private Integer goodsId; //商品设备中间id private Integer goodsId; //商品设备中间id
private Integer shopId; //商品id private Integer shopId; //商品id
private Integer facilityId; //设备id private Integer facilityId; //设备id
@ -35,40 +31,5 @@ public class DTOGoods {
private Integer maintainUserId; //维修员工 private Integer maintainUserId; //维修员工
private String facilityStatic; //设备状态 private String facilityStatic; //设备状态
private Integer delId; //删除状态 private Integer delId; //删除状态
=======
//商品设备中间id
private Integer goodsId;
//商品id
private Integer shopId;
//商品名称
private String shopName;
//商品价格
private double shopPrice;
//商品类型id
private Integer typeId;
//商品类型名称
private String typeName;
//图片
private List<String> pictureUrl;
//设备id
private Integer facilityId;
//设备类型
private String facilityType;
//设备地址
private String facilitySite;
//库存
private Integer goodsNum;
//上下架(逻辑字段: 0上架, 1下架)
private Integer goodsIsDelete;
>>>>>>> origin/master
} }

25
bwie-common/src/main/java/com/bwie/common/pojo/Facility.java
View File

@ -5,20 +5,17 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.ToString; import lombok.ToString;
<<<<<<< HEAD
/** /**
* @author FangShiBa * @author FangShiBa
* @date 2023/12/17 * @date 2023/12/17
* @apiNote * @apiNote
*/ */
=======
>>>>>>> origin/master
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@ToString @ToString
public class Facility { public class Facility {
<<<<<<< HEAD
private Integer facilityId; //设备编号 private Integer facilityId; //设备编号
private String facilityType; //设备类型 private String facilityType; //设备类型
private String facilitySite; //设备地址 private String facilitySite; //设备地址
@ -26,26 +23,6 @@ public class Facility {
private Integer maintainUserId; //维修员工 private Integer maintainUserId; //维修员工
private String facilityStatic; //设备状态 private String facilityStatic; //设备状态
private Integer delId; //删除状态 private Integer delId; //删除状态
=======
//设备编号
private Integer facilityId;
//设备类型
private String facilityType;
//设备地址
private String facilitySite;
//补货员工
private Integer replenishmentUserId;
//维修员工
private Integer maintainUserId;
//设备状态
private Integer facilityStatic;
//删除状态
private Integer delId;
>>>>>>> origin/master
} }

20
bwie-common/src/main/java/com/bwie/common/pojo/Goods.java
View File

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