Skip to content

R
RuiPengLoopbackApi
Commit 6fe0cb77 authored by 余海军's avatar 余海军
Browse files
Options

add

parent 437db2c4
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
server/model-config.json
View file @ 6fe0cb77
...@@ -265,7 +265,6 @@ ...@@ -265,7 +265,6 @@
"dataSource": "ruipeng", "dataSource": "ruipeng",
"public": true "public": true
}, },
<<<<<<< HEAD
"MainBilltotalrevenue": { "MainBilltotalrevenue": {
"dataSource": "ruipeng", "dataSource": "ruipeng",
"public": true "public": true
...@@ -319,7 +318,9 @@ ...@@ -319,7 +318,9 @@
"public": true "public": true
}, },
"MainRegister": { "MainRegister": {
======= "dataSource": "ruipeng",
"public": true
},
"HosLastyearbudget": { "HosLastyearbudget": {
"dataSource": "ruipeng", "dataSource": "ruipeng",
"public": true "public": true
...@@ -341,7 +342,6 @@ ...@@ -341,7 +342,6 @@
"public": true "public": true
}, },
"EducBrowse1": { "EducBrowse1": {
>>>>>>> b7fc8bf73da8560743aaf7ceee802056a1f73492
"dataSource": "ruipeng", "dataSource": "ruipeng",
"public": true "public": true
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment