add

6fe0cb77 · 余海军 · 437db2c4 · 6fe0cb77
Commit 6fe0cb77 authored Sep 10, 2019 by 余海军
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

model-config.json server/model-config.json +3 -3

No files found.
--- a/server/model-config.json
+++ b/server/model-config.json
@@ -265,7 +265,6 @@
    "dataSource": "ruipeng",
    "public": true
  },
-<<<<<<< HEAD
  "MainBilltotalrevenue": {
    "dataSource": "ruipeng",
    "public": true
@@ -319,7 +318,9 @@
    "public": true
  },
  "MainRegister": {
-=======
+    "dataSource": "ruipeng",
+    "public": true
+  },
  "HosLastyearbudget": {
    "dataSource": "ruipeng",
    "public": true
@@ -341,7 +342,6 @@
    "public": true
  },
  "EducBrowse1": {
->>>>>>> b7fc8bf73da8560743aaf7ceee802056a1f73492
    "dataSource": "ruipeng",
    "public": true
  }