productDev/parkBike.git

Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

doum

2025-09-08 55ba702c1df240929e68df3b42fa9cb0607378b8

分支
用户	doum <doum>
	星期一, 九月 8, 2025 10:58 +0800
提交者	doum <doum>
	星期一, 九月 8, 2025 10:58 +0800
提交	55ba702c1df240929e68df3b42fa9cb0607378b8
目录	61fd126002ef50026792e6c0b519ea46d6f8d7d6 目录 \| zip \| gz
上一版本	fa7ac16021db8d9a6a5bc214f50600420876325e 查看 \| 对比 25a25f620b016505a629b9c7565ea1c01864adab 查看 \| 对比

Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

# Conflicts:
#	admin/.env.development
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-line/u-line.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-modal/u-modal.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/pages/consumptionDetails/consumptionDetails.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/pages/maps/maps.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/pages/pricingRules/pricingRules.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/pages/problemReporting/problemReporting.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/pages/ridingDetails/ridingDetails.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/pages/settlementDetails/settlementDetails.js.map
#	bicycle/unpackage/dist/dev/.sourcemap/mp-weixin/pages/specification/specification.js.map
#	bicycle/unpackage/dist/dev/mp-weixin/common/vendor.js
#	bicycle/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js
#	bicycle/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line/u-line.js
#	bicycle/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js
#	bicycle/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-modal/u-modal.js
#	bicycle/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.js
#	bicycle/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-popup/u-popup.js
#	bicycle/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js
#	bicycle/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.js
#	bicycle/unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js
#	bicycle/unpackage/dist/dev/mp-weixin/pages/consumptionDetails/consumptionDetails.js
#	bicycle/unpackage/dist/dev/mp-weixin/pages/index/index.js
#	bicycle/unpackage/dist/dev/mp-weixin/pages/maps/maps.js
#	bicycle/unpackage/dist/dev/mp-weixin/pages/pricingRules/pricingRules.js
#	bicycle/unpackage/dist/dev/mp-weixin/pages/problemReporting/problemReporting.js
#	bicycle/unpackage/dist/dev/mp-weixin/pages/ridingDetails/ridingDetails.js
#	bicycle/unpackage/dist/dev/mp-weixin/pages/settlementDetails/settlementDetails.js
#	bicycle/unpackage/dist/dev/mp-weixin/pages/specification/specification.js
#	server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java

已添加19个文件

已修改32个文件

	admin/src/api/business/goodsorder.js	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/components/business/billDetail.vue	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/business/analysis.vue	203 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/business/goodsorder.vue	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/business/onlinePayStatistics.vue	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/business/wxBill.vue	15 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/business/wxBillDetail.vue	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/combo/record.vue	33 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/operation/components/AMap.vue	10 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/operation/components/TramEdit.vue	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/operation/site.vue	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/main.js	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/manifest.json	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/pages.json	21 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/pages/index/index.vue	19 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/pages/operationList/operationList.vue	680 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/pages/operationLogin/operationLogin.vue	122 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/pages/operationsCenter/operationsCenter.vue	99 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/static/icon/home_ic_mingxi.png	对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/static/icon/ic_close@2x.png	对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/static/icon/ic_guansuo@2x.png	对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/static/icon/ic_kaisuo@2x.png	对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/static/icon/ic_search@2x.png	对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/static/icon/ic_shaixuan@2x.png	对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/static/icon/ic_shangjia@2x.png	对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/static/icon/ic_xiajia@2x.png	对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/static/icon/list_checkbox@2x.png	对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/static/icon/list_checkbox_sel@2x.png	对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/static/icon/login_ic_name@2x.png	对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/static/icon/login_ic_password@2x.png	对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/static/images/home_i1mg_zulingxuzhi@2x.png	对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/unpackage/dist/dev/mp-weixin/app.json	5 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/unpackage/dist/dev/mp-weixin/common/main.js	6 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/unpackage/dist/dev/mp-weixin/pages/index/index.wxml	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/unpackage/dist/dev/mp-weixin/pages/index/index.wxss	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/unpackage/dist/dev/mp-weixin/project.private.config.json	27 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	bicycle/utils/http.api.js	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java	21 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	server/services/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java	64 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	server/services/src/main/java/com/doumee/core/utils/DateUtil.java	24 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java	13 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	server/services/src/main/java/com/doumee/dao/business/vo/BikeIncomeDetailReportVO.java	25 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	server/services/src/main/java/com/doumee/dao/business/vo/BikeIncomeReportVO.java	32 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	server/services/src/main/java/com/doumee/dao/business/web/response/RidesDetailResponse.java	3 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	server/services/src/main/java/com/doumee/service/business/GoodsorderService.java	7 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	server/services/src/main/java/com/doumee/service/business/impl/DiscountMemberServiceImpl.java	11 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java	192 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java	1 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	server/web/src/main/java/com/doumee/task/ScheduleTool.java	12 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史