Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/option/transportCapacity/transport-ship.js
#	src/option/transportCapacity/transport-vehicle.js
This commit is contained in:
2026-08-07 08:28:42 +08:00
24 changed files with 300 additions and 137 deletions
+1 -1
View File
@@ -193,7 +193,7 @@ export default {
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuWidth: 180,
column: [
{
label: '车船类型',