完成合并并解决冲突

xuxueyang

2024-09-14 92a4759e242421f578d463e457fcea33893c6c2a

 common/selfvar.scss

@@ -19,5 +19,5 @@
$u-primary: #20613D;
body {
  --tcolor: #3140A2;
  font-family: PingFangSC-Regular, PingFang SC;
  font-family: PingFangSC, PingFang SC,PingFangSC-Regular;
}