flowerbackend-v2.git

flowerbackend-v2

Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 in...

cloudroam

2024-10-28 617cac9aab814b33a4a0947d7222eae1098028ca

分支
用户	cloudroam <cloudroam>
	星期一, 十月 28, 2024 16:33 +0800
提交者	cloudroam <cloudroam>
	星期一, 十月 28, 2024 16:33 +0800
提交	617cac9aab814b33a4a0947d7222eae1098028ca
目录	4cc65c3eb835a991c6b21ea749d841a37d9e2c94 目录 \| zip \| gz
上一版本	f77c25900aac7231d006d8f4e08aaa12d72c62b4 查看 \| 对比 66f57ebef36c03353609ad3b2b6623396b5061a4 查看 \| 对比

Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4

 Conflicts:
	src/main/java/com/mzl/flower/dto/response/wallet/WalletBillRecordVO.java
	src/main/java/com/mzl/flower/mapper/wallet/WalletBillRecordMapper.java
	src/main/java/com/mzl/flower/service/impl/wallet/WalletBillRecordServiceImpl.java
	src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java
	src/main/java/com/mzl/flower/service/wallet/WalletBillRecordService.java
	src/main/java/com/mzl/flower/web/v2/wallet/WalletBillRecordController.java
	src/main/resources/mapper/wallet/WalletBillRecordMapper.xml

已修改16个文件

已添加9个文件

	src/main/java/com/mzl/flower/constant/LockConstants.java	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletAmountDTO.java	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletBillDTO.java	30 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletReduceDTO.java	33 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/dto/response/wallet/WalletBillRecordVO.java	39 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/dto/response/wallet/WalletReduceVO.java	29 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/mapper/wallet/WalletBillRecordMapper.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/mapper/wallet/WalletReduceMapper.java	33 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/service/impl/wallet/WalletBillRecordServiceImpl.java	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/service/impl/wallet/WalletReduceServiceImpl.java	45 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/service/impl/wallet/WalletServiceImpl.java	162 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/service/wallet/WalletBillRecordService.java	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/service/wallet/WalletReduceService.java	38 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/service/wallet/WalletService.java	41 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/web/v2/wallet/WalletBillRecordController.java	41 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/web/v2/wallet/WalletDeductController.java	53 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/report/OrderReportMapper.xml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/wallet/WalletBillRecordMapper.xml	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/wallet/WalletMapper.xml	24 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/wallet/WalletReduceMapper.xml	71 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml	4 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史