java/LiquorAuction.git

白酒拍卖

Merge remote-tracking branch 'origin/master'

rentaiming

2024-05-30 9bcc40d213a44498c46dae5e678e592b918b40b0

refs
用户	rentaiming <806181062@qq.com>
	星期四, 五月 30, 2024 18:33 +0800
提交者	rentaiming <806181062@qq.com>
	星期四, 五月 30, 2024 18:33 +0800
提交	9bcc40d213a44498c46dae5e678e592b918b40b0
目录	b97672b3993b9e1f5a20056be9aa52661b0868d8 目录 \| zip \| gz
parent	6d4dc59c70598f48f214554694fc8a38327ec5b8 查看 \| 对比 269e239a677763fb16da6bc39ab649eaccf3c9c1 查看 \| 对比

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
#	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java

9个文件已修改

13个文件已添加

	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/GoodsStockUpdDTO.java	23 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java	18 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java	25 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/AuctionBrowseRecordController.java	19 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/AuctionBrowseRecord.java	68 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionBrowseRecordMapper.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionBrowseRecordService.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java	38 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java	34 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/AuctionBrowseRecordMapper.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsBrowseRecordController.java	19 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSkuController.java	28 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsBrowseRecord.java	65 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/GoodsBrowseRecordMapper.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsBrowseRecordService.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSkuService.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java	65 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsBrowseRecordMapper.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史