Merge branch 'test' into test-lastlag

# Conflicts:
#	auth/src/main/java/com/baiyue/auth/service/AuthService.java
#	auth/src/test/java/com/baiyue/auth/service/AuthServiceSmallJwtTest.java

deploy/sql/头程数据库统一增量-MySQL8.sql

@@ -2657,7 +2657,7 @@ CREATE TABLE IF NOT EXISTS fl_inbound_carton_label (
   box_code VARCHAR(80) NOT NULL COMMENT '固定二维码内容：入仓码#总箱数-箱下标',
   total_carton_count INT UNSIGNED NOT NULL COMMENT '首次分配时整单总箱数',
   carton_index INT UNSIGNED NOT NULL COMMENT '整单从1开始的稳定箱下标',
-  label_version INT UNSIGNED NOT NULL DEFAULT 1 COMMENT '箱唛批次版本，从1递增',
+  label_version INT UNSIGNED NOT NULL DEFAULT 1 COMMENT '内部兼容批次字段，固定为1且不进入箱码',
   batch_status VARCHAR(16) NOT NULL DEFAULT 'ACTIVE' COMMENT '批次状态：ACTIVE有效、VOID已作废',
   cargo_fingerprint CHAR(64) NULL COMMENT '影响标签字段的SHA-256指纹',
   voided_at DATETIME(3) NULL COMMENT '批次作废时间',
@@ -2674,7 +2674,7 @@ CREATE TABLE IF NOT EXISTS fl_inbound_carton_label (
   CONSTRAINT fk_carton_label_inbound FOREIGN KEY (inbound_id) REFERENCES fl_inbound_order (id)
 ) ENGINE=InnoDB COMMENT='首次打印前冻结的实际箱号与订单货物明细映射';
 
--- 存量环境可能已在箱唛版本化前建表；CREATE TABLE IF NOT EXISTS 不会补列。
+-- 存量环境可能缺少稳定箱码映射兼容字段；CREATE TABLE IF NOT EXISTS 不会补列。
 DROP PROCEDURE IF EXISTS unified_carton_label_add_column;
 DELIMITER $$
 CREATE PROCEDURE unified_carton_label_add_column(IN p_column VARCHAR(64), IN p_definition TEXT)
@@ -2688,7 +2688,7 @@ BEGIN
   END IF;
 END$$
 DELIMITER ;
-CALL unified_carton_label_add_column('label_version', 'INT UNSIGNED NOT NULL DEFAULT 1 COMMENT ''箱唛批次版本，从1递增'' AFTER carton_index');
+CALL unified_carton_label_add_column('label_version', 'INT UNSIGNED NOT NULL DEFAULT 1 COMMENT ''内部兼容批次字段，固定为1且不进入箱码'' AFTER carton_index');
 CALL unified_carton_label_add_column('batch_status', 'VARCHAR(16) NOT NULL DEFAULT ''ACTIVE'' COMMENT ''批次状态：ACTIVE有效、VOID已作废'' AFTER label_version');
 CALL unified_carton_label_add_column('cargo_fingerprint', 'CHAR(64) NULL COMMENT ''影响标签字段的SHA-256指纹'' AFTER batch_status');
 CALL unified_carton_label_add_column('voided_at', 'DATETIME(3) NULL COMMENT ''批次作废时间'' AFTER cargo_fingerprint');
@@ -2699,9 +2699,12 @@ UPDATE fl_inbound_carton_label
        batch_status='ACTIVE'
  WHERE label_version IS NULL OR batch_status IS NULL;
 
+DELETE FROM fl_inbound_carton_label WHERE batch_status='VOID';
+
 UPDATE fl_inbound_carton_label
-   SET box_code=CONCAT(inbound_code, '#V', label_version, '#', total_carton_count, '-', carton_index)
- WHERE box_code NOT LIKE CONCAT(inbound_code, '#V%#%');
+   SET label_version=1,
+       box_code=CONCAT(inbound_code, '#', total_carton_count, '-', carton_index)
+ WHERE batch_status='ACTIVE';
 
 SET @ddl = IF(
   EXISTS(SELECT 1 FROM information_schema.statistics
@@ -10259,6 +10262,13 @@ CREATE TABLE IF NOT EXISTS fin_subject (
   UNIQUE KEY uk_fin_subject_code (subject_code)
 ) ENGINE=InnoDB COMMENT='平台财务主体；首期仅一个有效主体';
 
+INSERT INTO fin_subject
+  (subject_code, subject_name, status, version, created_by, updated_by)
+VALUES
+  ('PLATFORM_DEFAULT', '平台', 'ACTIVE', 0, 0, 0)
+ON DUPLICATE KEY UPDATE
+  subject_name = VALUES(subject_name), status = 'ACTIVE', updated_by = 0;
+
 CREATE TABLE IF NOT EXISTS fin_customer_settlement_profile (
   id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键ID',
   tenant_id BIGINT UNSIGNED NOT NULL COMMENT '客户ID和数据隔离键',
@@ -13760,7 +13770,7 @@ BEGIN
          AND table_name = 'fl_inbound_carton_label'
          AND column_name IN ('label_version', 'batch_status', 'cargo_fingerprint', 'voided_at')) <> 4 THEN
     SIGNAL SQLSTATE '45000'
-      SET MESSAGE_TEXT = '统一迁移失败：箱唛版本化字段未完整创建';
+      SET MESSAGE_TEXT = '统一迁移失败：稳定箱码映射兼容字段未完整创建';
   END IF;
   IF (SELECT COUNT(*) FROM information_schema.statistics
        WHERE table_schema = 'baiyue_firstleg'