merge(7.2.0.4): 合併遠端第二批追加,日誌節交叉衝突逐側比對

兩人的日誌節依推送順序排列,兩節皆保留
This commit is contained in:
HIsheR
2026-10-16 15:58:46 +08:00
2 changed files with 11 additions and 0 deletions
+3
View File
@@ -13,5 +13,8 @@ export interface WarehouseLabel {
color: string;
}
/** 預設標籤顏色(未設定顏色時使用) */
export const DEFAULT_LABEL_COLOR = "#4a9eea";
/** 依倉庫查詢標籤設定 */
export const getLabel = (warehouseId: string): WarehouseLabel | null => null;