fangzhe 4aa014098e Merge remote-tracking branch 'origin/master' ... # Conflicts: # .idea/encodings.xml # bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOGoods.java # bwie-common/src/main/java/com/bwie/common/pojo/Facility.java # bwie-common/src/main/java/com/bwie/common/pojo/Goods.java # bwie-common/src/main/java/com/bwie/common/pojo/Shop.java # bwie-common/src/main/java/com/bwie/common/pojo/VO/VOGoods.java # bwie-models/pom.xml		2023-12-19 16:47:53 +08:00
..
inspectionProfiles	上下架+进货	2023-12-19 16:25:05 +08:00
.gitignore	项目框架	2023-12-16 11:34:12 +08:00
encodings.xml	Merge remote-tracking branch 'origin/master'	2023-12-19 16:47:53 +08:00
misc.xml	新增list框架	2023-12-17 11:07:56 +08:00
uiDesigner.xml	售货机商品列表及购买功能	2023-12-17 15:10:05 +08:00
vcs.xml	项目框架	2023-12-16 11:34:12 +08:00