被忽略的冲突修复

src/utils/dict.js

@@ -287,8 +287,7 @@ export const DICT_TYPE = {
   ECW_INCOME_RELATION_SYMBOL: "income_relation_symbol", //银行收支明细查询关系符号
   LADING_BILL_STATUS_DATA: "lading_Bill_Status_Data", //提单制作
   ATTRIBUTION_OF_INCOME: "attribution_of_income", //收入归属
-  PICKUP_RATE_COMPARISON_SYMBOLS: "pickup_rate_comparison_symbols" //提货率比较符号
-}
+  PICKUP_RATE_COMPARISON_SYMBOLS: "pickup_rate_comparison_symbols", //提货率比较符号
   CURRENCY_RATE_STATUS: "currency_rate_status", // 货币汇率状态
 };