鼎元农机小程序
上一版本: 22aaac | 补丁 | 提交对比
doum
12 小时以前 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1
分支
用户 doum <doum>
星期五, 一月 16, 2026 18:58 +0800
提交者 doum <doum>
星期五, 一月 16, 2026 18:58 +0800
提交80fd41ea0dc602ac3ca33778f17fce5bc2e817b1
目录 7d68f43f30078d7e5000d958b923048d97d92695 目录 | zip | gz
上一版本 22aaacd9e51da58ed10221639b6bd2fd9a13c6e5 查看 | 对比
c6675b55023dff3c4f441ab0bb9493198949126e 查看 | 对比 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java
#	server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
#	server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
已添加28个文件
已修改24个文件
2684 ■■■■■ 文件已修改
server/dmmall_admin/src/main/java/com/doumee/api/business/MemberBankController.java 90 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_admin/src/main/java/com/doumee/api/business/WithdrawRecordController.java 90 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/db/business.member_bank.permissions.sql 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/db/business.withdraw_record.permissions.sql 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/config/Jwt/JwtPayLoad.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java 67 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/config/annotation/LoginShopRequired.java 10 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java 13 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/business/GoodsorderMapper.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/business/MemberBankMapper.java 12 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/business/WithdrawRecordMapper.java 12 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Member.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberBank.java 74 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Shop.java 5 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/business/model/WithdrawRecord.java 105 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/web/dto/IntegralRecordDTO.java 24 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/web/dto/ShopLoginDTO.java 23 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/web/dto/shop/ShopListDTO.java 23 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/web/request/MemberBankSaveRequest.java 44 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/web/request/MyCustomerRequest.java 22 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/web/request/SaleReportRequest.java 28 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/web/request/ShopOrderRequest.java 24 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/web/request/WithdrawApplyRequest.java 28 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/web/request/WxPhoneRequest.java 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/web/response/AccountResponse.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/web/response/IntegralDataResponse.java 29 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/web/response/MyCustomerResponse.java 35 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/web/response/SaleReportOrderResponse.java 66 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/web/response/SaleReportResponse.java 35 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/web/response/ShopInfoResponse.java 71 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java 9 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java 17 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/IntegralService.java 19 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/MemberBankService.java 103 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/MemberService.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/ShopService.java 58 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/WithdrawRecordService.java 106 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java 72 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java 86 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberBankServiceImpl.java 207 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java 219 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java 260 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java 274 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java 21 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_web/src/main/java/com/doumee/api/web/ApiController.java 15 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_web/src/main/java/com/doumee/api/web/MemberBankApi.java 57 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_web/src/main/java/com/doumee/api/web/ShopApi.java 52 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_web/src/main/java/com/doumee/api/web/mall/IntegralApi.java 63 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/dmmall_web/src/main/java/com/doumee/api/web/mall/OrderApi.java 56 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史