Commit Graph

14 Commits (ren)

Author SHA1 Message Date
rxh 5c60bd5d24 售货机 2023-12-20 07:39:44 +08:00
ASUS 2f49fd4856 新增修改 2023-12-19 19:25:33 +08:00
lijiayao 69159dceb2 销售日志 2023-12-19 17:14:53 +08:00
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
ASUS 67157de6ad Merge branch 'master' of https://gitea.qinmian.online/FiveTeam/ShopManage
# Conflicts:
#	bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/ShopController.java
2023-12-19 16:35:26 +08:00
ASUS 7757177af6 上下架+进货 2023-12-19 16:25:05 +08:00
rxh 0ef66c37fe Merge pull request 'blue' (#1) from blue into master
Reviewed-on: #1
2023-12-19 14:18:13 +08:00
ASUS b7e8563b10 展示商品设备表 2023-12-18 21:28:27 +08:00
fangzhe 9234eb12b4 售货机商品列表及购买功能(完善) 2023-12-18 21:05:54 +08:00
ASUS b1cc202f06 添加图片(类型搜索, 商品列表, 添加商品, 上传图片) 2023-12-18 09:45:50 +08:00
fangzhe 9f40ad6a5e 售货机商品列表及购买功能 2023-12-17 16:23:48 +08:00
fangzhe 08420bb7e1 售货机商品列表及购买功能 2023-12-17 15:10:05 +08:00
ASUS e22a86ba7c 新增list框架 2023-12-17 11:07:56 +08:00
fangzhe afeaa6160a 项目框架 2023-12-16 11:34:12 +08:00