Merge remote-tracking branch 'origin/test' into dev

# Conflicts:
#	firstleg/src/main/java/com/baiyue/firstleg/service/MeasurementBatchService.java
#	lastleg-service/src/main/resources/db/lastleg.sql

firstleg/src/main/resources/openapi/firstleg-v1.yaml

@@ -168,6 +168,20 @@ paths:
       responses:
         '200': {description: 成功时 data 为更新后的 CustomerDimensionConfigGroupResponse}
         '403': {description: 无编辑权限}
+  /api/platform/v1/first-leg/customer-dimension-config/default-calculation-mode:
+    put:
+      summary: 设置客户订单外箱规默认计算方式
+      description: 需要 firstleg:dimension-config:edit 权限；ADD 表示按箱规尺寸加宽，MULTIPLY 表示按默认权重系数计算。
+      parameters:
+        - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema: {$ref: '#/components/schemas/CustomerDimensionDefaultCalculationModeUpdateRequest'}
+      responses:
+        '200': {description: 成功时 data 为更新后的 CustomerDimensionConfigGroupResponse}
+        '403': {description: 无编辑权限}
   /internal/firstleg/v1/inbounds/order-approved:
     post:
       summary: 订单审核通过后幂等创建入库单
@@ -762,7 +776,8 @@ paths:
     post:
       summary: 平台模拟单箱设备扫描
       description: >-
-        需要 platform:firstleg:inbound:measure:edit 权限；仅用于平台联调和代设备录入，
+        需要 platform:firstleg:inbound:warehouse-suggestion:edit 或兼容权限
+        platform:firstleg:inbound:measure:edit；仅用于平台联调和代设备录入，
         复用正式单箱覆盖规则，不代表最终第三方设备协议或鉴权方式。
       parameters:
         - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
@@ -1354,6 +1369,11 @@ components:
           maxItems: 4
           description: 必须恰好包含 SMALL、MEDIUM、LARGE、EXTRA_LARGE 各一行
           items: {$ref: '#/components/schemas/CustomerDimensionConfigRuleUpdateRequest'}
+    CustomerDimensionDefaultCalculationModeUpdateRequest:
+      type: object
+      required: [defaultCalculationMode]
+      properties:
+        defaultCalculationMode: {type: string, enum: [ADD, MULTIPLY]}
     CustomerDimensionConfigRuleUpdateRequest:
       type: object
       required: [boxType, innerLengthCm, innerWidthCm, innerHeightCm, edgeAdditionCm, version]
@@ -1373,9 +1393,10 @@ components:
         version: {type: integer, minimum: 0, description: 乐观锁版本号}
     CustomerDimensionConfigGroupResponse:
       type: object
-      required: [tenantId, rules]
+      required: [tenantId, defaultCalculationMode, rules]
       properties:
         tenantId: {type: string, pattern: '^[1-9][0-9]*$'}
+        defaultCalculationMode: {type: string, enum: [ADD, MULTIPLY]}
         rules:
           type: array
           minItems: 4
@@ -1508,6 +1529,8 @@ components:
         outerLengthCm: {type: number, format: double, nullable: true}
         outerWidthCm: {type: number, format: double, nullable: true}
         outerHeightCm: {type: number, format: double, nullable: true}
+        chargeRuleId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
+        coefficientMode: {type: string, enum: [ADD, MULTIPLY], nullable: true}
         remark: {type: string, nullable: true}
         boxCode: {type: string, nullable: true}
         scannedShipmentId: {type: string, nullable: true}
@@ -1622,6 +1645,8 @@ components:
         outerLengthCm: {type: number, minimum: 0, nullable: true}
         outerWidthCm: {type: number, minimum: 0, nullable: true}
         outerHeightCm: {type: number, minimum: 0, nullable: true}
+        chargeRuleId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
+        coefficientMode: {type: string, enum: [ADD, MULTIPLY], nullable: true}
         remark: {type: string, maxLength: 500, nullable: true}
     InboundMeasurementDetailEnvelope:
       type: object