java/LiquorAuction.git

mitao

2024-05-27 f66cd5340a8c9a5264c82549f25e4d88cf2d815a

refs
用户	mitao <2763622819@qq.com>
	星期一, 五月 27, 2024 15:54 +0800
提交者	mitao <2763622819@qq.com>
	星期一, 五月 27, 2024 15:54 +0800
提交	f66cd5340a8c9a5264c82549f25e4d88cf2d815a
目录	a64678e3d7ad1e20f9b0d4293d60f39fe3aca1f8 目录 \| zip \| gz
parent	30278e28467dc493eb97c4c219f6fb9c2ec8e24b 查看 \| 对比 c26092c422c4b72fa5d51a38f6de1b48ab1ccd87 查看 \| 对比

Merge branch 'dev-mitao'

2 文件已复制

5 文件已重命名

22个文件已修改

17个文件已添加

	ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/MemberArticleCollectionController.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/MemberArticleCollection.java	39 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/mapper/MemberArticleCollectionMapper.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IMemberArticleCollectionService.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-article/src/main/resources/mapper/article/MemberArticleCollectionMapper.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionBidRecordController.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomGoodsController.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/MemberAuctionCollectionController.java	19 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionGoodsController.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/AuctionGoodsDTO.java	67 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/AuctionBidRecord.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/AuctionGoods.java	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/AuctionSalesroom.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/AuctionSalesroomGoods.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/AuctionVideo.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/MemberAuctionCollection.java	39 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionBidRecordMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionGoodsMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionSalesroomGoodsMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionSalesroomMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/AuctionVideoMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/mapper/MemberAuctionCollectionMapper.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionBidRecordService.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionGoodsService.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomGoodsService.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionVideoService.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IMemberAuctionCollectionService.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBidRecordServiceImpl.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java	27 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionVideoServiceImpl.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-auction/src/main/resources/mapper/auction/MemberAuctionCollectionMapper.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/MemberGoodsCollectionController.java	19 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/MemberGoodsCollection.java	63 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/MemberGoodsCollectionMapper.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IMemberGoodsCollectionService.java	16 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/async/AsyncMethodService.java	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java	20 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/MemberGoodsCollectionMapper.xml	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史