高铁站行李寄存系统
上一版本: d11716 | 补丁 | 提交对比
doum
7 天以前 0ad75ffcfc4c581ef54de705fae48b44803ed2a5
分支
用户 doum <doum>
星期二, 四月 21, 2026 11:27 +0800
提交者 doum <doum>
星期二, 四月 21, 2026 11:27 +0800
提交0ad75ffcfc4c581ef54de705fae48b44803ed2a5
目录 a94d9e86d9d87a9ba100714a5623bd3fac5f95a9 目录 | zip | gz
上一版本 d1171676ed28846f515250969f6b720523e2871d 查看 | 对比
1c930a8b1ab9abdb851a486b2da55bcda34cd082 查看 | 对比 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	server/services/src/main/java/com/doumee/config/alipay/AlipayFundTransUniTransfer.java
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-action-sheet/u-action-sheet.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-badge/u-badge.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-gap/u-gap.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-line/u-line.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-modal/u-modal.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-picker/u-picker.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-switch/u-switch.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-tabs/u-tabs.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-toolbar/u-toolbar.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/address/address.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/all-orders/all-orders.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/delivery-order-detail/delivery-order-detail.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/details-entry/details-entry.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/itinerary/itinerary.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/luggage-storage/luggage-storage.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/new-address/new-address.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/orders/orders.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/payment-success/payment-success.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/qualification/qualification.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/rich-text/rich-text.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/settings/settings.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/storage-order-detail/storage-order-detail.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/storage-point/storage-point.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/store-apply/store-apply.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/store-home/store-home.js.map
#	small-program/unpackage/dist/dev/.sourcemap/mp-weixin/pages/store-info/store-info.js.map
#	small-program/unpackage/dist/dev/mp-weixin/common/vendor.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-action-sheet/u-action-sheet.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-badge/u-badge.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-gap/u-gap.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line/u-line.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-modal/u-modal.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-switch/u-switch.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-tabs/u-tabs.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-toolbar/u-toolbar.js
#	small-program/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js
#	small-program/unpackage/dist/dev/mp-weixin/pages/details-entry/details-entry.js
已添加15个文件
已删除1个文件
已修改41个文件
已重命名1个文件
2816 ■■■■■ 文件已修改
server/services/db/db_change.sql 14 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/biz/system/impl/AreasBizImpl.java 26 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/config/alipay/AlipayProperties.java 41 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/config/wx/WxMiniConfig.java 52 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/config/wx/WxMiniUtilService.java 50 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/config/wx/WxPayProperties.java 16 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/config/wx/WxPayV3Service.java 186 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/core/constants/Constants.java 168 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/core/utils/aliyun/AliSmsService.java 12 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/core/utils/geocode/MapUtil.java 168 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/core/utils/tencent/MapUtil.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/NoticeMapper.java 12 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/model/DriverInfo.java 6 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/model/Notice.java 68 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/model/OrdersRefund.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/model/ShopInfo.java 3 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/dto/AlipayTransferDTO.java 39 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/dto/DriverPickupDTO.java 28 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/dto/DriverVerifyRequest.java 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/dto/ShopApplyDTO.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/dto/ShopUpdateDTO.java 8 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/vo/PlatformAboutVO.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/vo/ShopDetailVO.java 9 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/DriverInfoService.java 17 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/NoticeService.java 37 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/OrdersService.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java 203 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java 16 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java 126 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java 269 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java 15 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java 94 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/resources/application-dev.yml 13 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/resources/application-pro.yml 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/services/src/main/resources/application-test.yml 7 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/web/src/main/java/com/doumee/api/web/ConfigApi.java 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/web/src/main/java/com/doumee/api/web/DriverInfoApi.java 26 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/web/src/main/java/com/doumee/api/web/PaymentCallback.java 169 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
server/web/src/main/java/com/doumee/api/web/ShopInfoApi.java 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
small-program/pages/address/address.vue 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
small-program/pages/details-entry/details-entry.vue 418 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
small-program/pages/mine/mine.vue 9 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
small-program/pages/store-apply/store-apply.vue 110 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
small-program/static/icon/address_ic_edit@2x.png 对比 | 查看 | 原始文档 | blame | 历史
small-program/static/icon/ic_fail@2x.png 对比 | 查看 | 原始文档 | blame | 历史
small-program/static/icon/ic_pass@2x.png 对比 | 查看 | 原始文档 | blame | 历史
small-program/unpackage/dist/dev/mp-weixin/pages/address/address.wxss 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
small-program/unpackage/dist/dev/mp-weixin/pages/details-entry/details-entry.wxml 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
small-program/unpackage/dist/dev/mp-weixin/pages/details-entry/details-entry.wxss 111 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
small-program/unpackage/dist/dev/mp-weixin/pages/mine/mine.js 21 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
small-program/unpackage/dist/dev/mp-weixin/pages/mine/mine.wxml 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
small-program/unpackage/dist/dev/mp-weixin/pages/store-apply/store-apply.js 179 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
small-program/unpackage/dist/dev/mp-weixin/pages/store-apply/store-apply.wxml 2 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
small-program/unpackage/dist/dev/mp-weixin/project.private.config.json 18 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
small-program/unpackage/dist/dev/mp-weixin/static/icon/address_ic_edit@2x.png 对比 | 查看 | 原始文档 | blame | 历史
small-program/unpackage/dist/dev/mp-weixin/static/icon/ic_fail@2x.png 对比 | 查看 | 原始文档 | blame | 历史
small-program/unpackage/dist/dev/mp-weixin/static/icon/ic_pass@2x.png 对比 | 查看 | 原始文档 | blame | 历史
small-program/utils/http.api.js 4 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史