Commit Graph

15 Commits (master)

Author SHA1 Message Date
wudi 7f1416c82c ok 版 2024-03-15 20:34:22 +08:00
wudi 743406514c 计价 2024-03-15 15:46:14 +08:00
wudi 3361cd9357 Merge remote-tracking branch 'origin/xuzhaokun'
# Conflicts:
#	.idea/compiler.xml
#	.idea/misc.xml
#	boot-auth/src/main/resources/bootstrap.yml
#	boot-auth/target/classes/bootstrap.yml
#	boot-common/boot-common-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-datascope/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-datasource/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-log/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-redis/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-security/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-swagger/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-gateway/src/main/resources/bootstrap.yml
#	boot-gateway/target/classes/bootstrap.yml
#	boot-modules/boot-file/boot-file-server/src/main/resources/bootstrap.yml
#	boot-modules/boot-gen/src/main/resources/bootstrap.yml
#	boot-modules/boot-job/src/main/resources/bootstrap.yml
#	boot-modules/boot-job/target/classes/com/boot/job/BootJobApplication.class
#	boot-modules/boot-system/boot-system-server/src/main/resources/bootstrap.yml
#	boot-valuation-rule/boot-valuation-rule-server/src/main/resources/bootstrap.yml
#	boot-valuation-rule/boot-valuation-rule-server/target/classes/bootstrap.yml
#	boot-valuation/boot-valuation-server/src/main/resources/bootstrap.yml
#	boot-valuation/boot-valuation-server/target/classes/bootstrap.yml
#	boot-visual/boot-monitor/src/main/resources/bootstrap.yml
#	boot-visual/boot-monitor/target/classes/bootstrap.yml
#	logs/boot-auth/error.log
#	logs/boot-auth/info.2023-11-20.log
#	logs/boot-auth/info.2024-02-21.log
#	logs/boot-auth/info.log
#	logs/boot-file/error.log
#	logs/boot-file/info.log
#	logs/boot-gateway/error.log
#	logs/boot-gateway/info.2023-11-20.log
#	logs/boot-gateway/info.2024-02-21.log
#	logs/boot-gateway/info.log
#	logs/boot-gen/error.log
#	logs/boot-gen/info.2023-11-20.log
#	logs/boot-gen/info.log
#	logs/boot-job/info.2023-11-20.log
#	logs/boot-job/info.log
#	logs/boot-system/error.2023-11-20.log
#	logs/boot-system/error.log
#	logs/boot-system/info.2023-11-20.log
#	logs/boot-system/info.2024-02-21.log
#	logs/boot-system/info.log
#	logs/boot-visual-monitor/error.log
#	logs/boot-visual-monitor/info.log
#	pom.xml
2024-03-15 15:40:01 +08:00
wudi 0be153d287 Merge remote-tracking branch 'origin/wd'
# Conflicts:
#	.idea/compiler.xml
#	.idea/encodings.xml
#	.idea/jarRepositories.xml
#	boot-auth/src/main/resources/bootstrap.yml
#	boot-auth/target/classes/bootstrap.yml
#	boot-auth/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-datascope/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-datasource/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-log/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-redis/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-security/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-common/boot-common-swagger/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-gateway/src/main/resources/bootstrap.yml
#	boot-gateway/target/classes/bootstrap.yml
#	boot-gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-modules/boot-file/boot-file-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-modules/boot-file/boot-file-remote/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-modules/boot-file/boot-file-server/src/main/resources/bootstrap.yml
#	boot-modules/boot-file/boot-file-server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-modules/boot-gen/src/main/resources/bootstrap.yml
#	boot-modules/boot-gen/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-modules/boot-job/src/main/resources/bootstrap.yml
#	boot-modules/boot-job/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-modules/boot-system/boot-system-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-modules/boot-system/boot-system-remote/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-modules/boot-system/boot-system-server/src/main/resources/bootstrap.yml
#	boot-modules/boot-system/boot-system-server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	boot-valuation-rule/boot-valuation-rule-server/src/main/resources/bootstrap.yml
#	boot-valuation-rule/boot-valuation-rule-server/target/classes/bootstrap.yml
#	boot-valuation/boot-valuation-server/src/main/resources/bootstrap.yml
#	boot-valuation/boot-valuation-server/target/classes/bootstrap.yml
#	boot-visual/boot-monitor/src/main/resources/bootstrap.yml
#	boot-visual/boot-monitor/target/classes/bootstrap.yml
#	boot-visual/boot-monitor/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
#	logs/boot-auth/info.log
#	logs/boot-file/info.log
#	logs/boot-gateway/error.log
#	logs/boot-gateway/info.log
#	logs/boot-gen/info.log
#	logs/boot-job/info.log
#	logs/boot-system/info.log
#	logs/boot-visual-monitor/info.log
2024-03-15 15:32:04 +08:00
wudi 9f45da9924 计价 2024-03-15 15:21:28 +08:00
wudi c66aef8d6f 计费 添加 列表 支付 2024-03-08 19:31:58 +08:00
wudi 317d32e8fa Merge pull request 'zhaokangyu' (#4) from zhaokangyu into master
Reviewed-on: #4
2024-03-03 10:47:54 +08:00
zhaokangyu 1eb1938a59 添加 计费规则 2024-03-02 17:21:51 +08:00
wudi d97349d5bd 计费 添加 列表 2024-03-01 15:30:59 +08:00
zhaokangyu f55d493250 计价 2024-03-01 15:00:50 +08:00
Ren ZeXin 44c58b60aa rzx-2024年3月1日11:57:31 2024-03-01 11:57:40 +08:00
zhengshixian c961811aaf 第一次上传-maven有缺陷-郑师贤 2024-02-26 14:46:28 +08:00
Ren ZeXin 6bb911883e rzx-2024年2月23日09:59:18 2024-02-23 09:59:26 +08:00
zhaokangyu 203d06070a 网约车 初始化后台 2024-02-22 15:34:18 +08:00
zhaokangyu 35806335fa 网约车 初始化后台 2024-02-22 15:15:04 +08:00