合并分支冲突解决

zuozhengqing

2024-03-20 f4ed5ae8873f65c36b5cf37be264f6ec1e154647

 src/assets/style/variable.scss

@@ -20,4 +20,4 @@
$color-border-4: #f2f6fc;

// 背景
$color-bg: #f8f8f9;
$color-bg: #E6ECF2;