Merge branch 'test' into dev

2026-08-20 09:50:48 +08:00
parent cf2356bccb be5d89a4e6
commit e469749a98
25 changed files with 836 additions and 43 deletions
@@ -635,7 +635,7 @@ CREATE TABLE IF NOT EXISTS fl_inbound_fee (
  subtotal_amount DECIMAL(18,2) NOT NULL COMMENT '基础费用金额',
  additional_amount DECIMAL(18,2) NOT NULL DEFAULT 0 COMMENT '附加费金额',
  total_amount DECIMAL(18,2) NOT NULL COMMENT '总金额',
-  fee_status VARCHAR(24) NOT NULL DEFAULT 'CALCULATED' COMMENT '费用状态：CALCULATED已计算、SUPERSEDED已被新版本替代',
+  fee_status VARCHAR(24) NOT NULL DEFAULT 'CALCULATED' COMMENT '费用状态：CALCULATED已计算、CONFIRMED已确认、SENT已发送、SUPERSEDED已被新版本替代、VOIDED已作废',
  review_status VARCHAR(24) NOT NULL DEFAULT 'NOT_SUBMITTED' COMMENT '费用审核状态：NOT_SUBMITTED未提交、PENDING待审核、APPROVED已通过、REJECTED已驳回、CONFIRMED已确认',
  exception_release TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否基于测量异常放行生成',
  calculated_by BIGINT UNSIGNED NOT NULL COMMENT '试算人ID',