Merge remote-tracking branch 'websoft/master'

# Conflicts: # src/views/business/components/business-crud-page.vue # src/views/business/contract-manage.vue # src/views/settlement/components/pre-settlement-editor.vue # src/views/settlement/formal-settlement.vue
2026-08-22 21:12:26 +08:00
parent 5fcb82c0c0 5cf688bf06
commit 44e31fbd22
31 changed files with 1098 additions and 616 deletions
@@ -1752,7 +1752,7 @@ export default {
    font-size: 16px;
  }
  .el-form-item {
-    margin-bottom: 16px;
+    margin-bottom: 14px;
  }
 }
 .goods-heading {