add

common/models/educ-browse-1.js

+'use strict';
+
+module.exports = function(Educbrowse1) {
+
+};

common/models/educ-browse-1.json

+{
+  "name": "EducBrowse1",
+  "base": "PersistedModel",
+  "idInjection": false,
+  "options": {
+    "validateUpsert": true
+  },
+  "mysql": {
+    "schema": "wordpress",
+    "table": "educ_browse1"
+  },
+  "properties": {
+    "id": {
+      "type": "String",
+      "required": false,
+      "length": 36,
+      "precision": null,
+      "scale": null,
+      "mysql": {
+        "columnName": "id",
+        "dataType": "varchar",
+        "dataLength": 36,
+        "dataPrecision": null,
+        "dataScale": null,
+        "nullable": "Y"
+      }
+    },
+    "name": {
+      "type": "String",
+      "required": true,
+      "length": 13,
+      "precision": null,
+      "scale": null,
+      "mysql": {
+        "columnName": "name",
+        "dataType": "varchar",
+        "dataLength": 13,
+        "dataPrecision": null,
+        "dataScale": null,
+        "nullable": "N"
+      }
+    },
+    "value": {
+      "type": "Number",
+      "required": false,
+      "length": null,
+      "precision": 11,
+      "scale": 2,
+      "mysql": {
+        "columnName": "value",
+        "dataType": "float",
+        "dataLength": null,
+        "dataPrecision": 11,
+        "dataScale": 2,
+        "nullable": "Y"
+      }
+    }
+  },
+  "validations": [],
+  "relations": {},
+  "acls": [],
+  "methods": {}
+}

common/models/educ-course-4.js

+'use strict';
+
+module.exports = function(Educcourse4) {
+
+};

common/models/educ-course-4.json

+{
+  "name": "EducCourse4",
+  "base": "PersistedModel",
+  "idInjection": false,
+  "options": {
+    "validateUpsert": true
+  },
+  "mysql": {
+    "schema": "wordpress",
+    "table": "educ_course4"
+  },
+  "properties": {
+    "id": {
+      "type": "String",
+      "required": false,
+      "length": 36,
+      "precision": null,
+      "scale": null,
+      "mysql": {
+        "columnName": "id",
+        "dataType": "varchar",
+        "dataLength": 36,
+        "dataPrecision": null,
+        "dataScale": null,
+        "nullable": "Y"
+      }
+    },
+    "name": {
+      "type": "String",
+      "required": true,
+      "length": 13,
+      "precision": null,
+      "scale": null,
+      "mysql": {
+        "columnName": "name",
+        "dataType": "varchar",
+        "dataLength": 13,
+        "dataPrecision": null,
+        "dataScale": null,
+        "nullable": "N"
+      }
+    },
+    "value": {
+      "type": "Number",
+      "required": false,
+      "length": null,
+      "precision": 11,
+      "scale": 2,
+      "mysql": {
+        "columnName": "value",
+        "dataType": "float",
+        "dataLength": null,
+        "dataPrecision": 11,
+        "dataScale": 2,
+        "nullable": "Y"
+      }
+    }
+  },
+  "validations": [],
+  "relations": {},
+  "acls": [],
+  "methods": {}
+}

common/models/hos-lastyearbudget.js

+'use strict';
+
+module.exports = function(Hoslastyearbudget) {
+
+};

common/models/hos-lastyearbudget.json

+{
+  "name": "HosLastyearbudget",
+  "base": "PersistedModel",
+  "idInjection": false,
+  "options": {
+    "validateUpsert": true
+  },
+  "mysql": {
+    "schema": "wordpress",
+    "table": "hos_lastyearbudget"
+  },
+  "properties": {
+    "id": {
+      "type": "String",
+      "required": false,
+      "length": 36,
+      "precision": null,
+      "scale": null,
+      "mysql": {
+        "columnName": "id",
+        "dataType": "varchar",
+        "dataLength": 36,
+        "dataPrecision": null,
+        "dataScale": null,
+        "nullable": "Y"
+      }
+    },
+    "name": {
+      "type": "String",
+      "required": true,
+      "length": 6,
+      "precision": null,
+      "scale": null,
+      "mysql": {
+        "columnName": "name",
+        "dataType": "varchar",
+        "dataLength": 6,
+        "dataPrecision": null,
+        "dataScale": null,
+        "nullable": "N"
+      }
+    },
+    "value": {
+      "type": "Number",
+      "required": false,
+      "length": null,
+      "precision": 23,
+      "scale": null,
+      "mysql": {
+        "columnName": "value",
+        "dataType": "double",
+        "dataLength": null,
+        "dataPrecision": 23,
+        "dataScale": null,
+        "nullable": "Y"
+      }
+    }
+  },
+  "validations": [],
+  "relations": {},
+  "acls": [],
+  "methods": {}
+}

common/models/hos-lastyearregum.js

+'use strict';
+
+module.exports = function(Hoslastyearregum) {
+
+};

common/models/hos-lastyearregum.json

+{
+  "name": "HosLastyearregum",
+  "base": "PersistedModel",
+  "idInjection": false,
+  "options": {
+    "validateUpsert": true
+  },
+  "mysql": {
+    "schema": "wordpress",
+    "table": "hos_lastyearregum"
+  },
+  "properties": {
+    "id": {
+      "type": "String",
+      "required": false,
+      "length": 36,
+      "precision": null,
+      "scale": null,
+      "mysql": {
+        "columnName": "id",
+        "dataType": "varchar",
+        "dataLength": 36,
+        "dataPrecision": null,
+        "dataScale": null,
+        "nullable": "Y"
+      }
+    },
+    "name": {
+      "type": "String",
+      "required": true,
+      "length": 7,
+      "precision": null,
+      "scale": null,
+      "mysql": {
+        "columnName": "name",
+        "dataType": "varchar",
+        "dataLength": 7,
+        "dataPrecision": null,
+        "dataScale": null,
+        "nullable": "N"
+      }
+    },
+    "value": {
+      "type": "Number",
+      "required": false,
+      "length": null,
+      "precision": 32,
+      "scale": 0,
+      "mysql": {
+        "columnName": "value",
+        "dataType": "decimal",
+        "dataLength": null,
+        "dataPrecision": 32,
+        "dataScale": 0,
+        "nullable": "Y"
+      }
+    }
+  },
+  "validations": [],
+  "relations": {},
+  "acls": [],
+  "methods": {}
+}

common/models/hos-thisyearbudget.js

+'use strict';
+
+module.exports = function(Hosthisyearbudget) {
+
+};

common/models/hos-thisyearbudget.json

+{
+  "name": "HosThisyearbudget",
+  "base": "PersistedModel",
+  "idInjection": false,
+  "options": {
+    "validateUpsert": true
+  },
+  "mysql": {
+    "schema": "wordpress",
+    "table": "hos_thisyearbudget"
+  },
+  "properties": {
+    "id": {
+      "type": "String",
+      "required": false,
+      "length": 36,
+      "precision": null,
+      "scale": null,
+      "mysql": {
+        "columnName": "id",
+        "dataType": "varchar",
+        "dataLength": 36,
+        "dataPrecision": null,
+        "dataScale": null,
+        "nullable": "Y"
+      }
+    },
+    "name": {
+      "type": "String",
+      "required": true,
+      "length": 6,
+      "precision": null,
+      "scale": null,
+      "mysql": {
+        "columnName": "name",
+        "dataType": "varchar",
+        "dataLength": 6,
+        "dataPrecision": null,
+        "dataScale": null,
+        "nullable": "N"
+      }
+    },
+    "value": {
+      "type": "Number",
+      "required": false,
+      "length": null,
+      "precision": 23,
+      "scale": null,
+      "mysql": {
+        "columnName": "value",
+        "dataType": "double",
+        "dataLength": null,
+        "dataPrecision": 23,
+        "dataScale": null,
+        "nullable": "Y"
+      }
+    }
+  },
+  "validations": [],
+  "relations": {},
+  "acls": [],
+  "methods": {}
+}

common/models/hos-thisyearregum.js

+'use strict';
+
+module.exports = function(Hosthisyearregum) {
+
+};

common/models/hos-thisyearregum.json

+{
+  "name": "HosThisyearregum",
+  "base": "PersistedModel",
+  "idInjection": false,
+  "options": {
+    "validateUpsert": true
+  },
+  "mysql": {
+    "schema": "wordpress",
+    "table": "hos_thisyearregum"
+  },
+  "properties": {
+    "id": {
+      "type": "String",
+      "required": false,
+      "length": 36,
+      "precision": null,
+      "scale": null,
+      "mysql": {
+        "columnName": "id",
+        "dataType": "varchar",
+        "dataLength": 36,
+        "dataPrecision": null,
+        "dataScale": null,
+        "nullable": "Y"
+      }
+    },
+    "name": {
+      "type": "String",
+      "required": true,
+      "length": 7,
+      "precision": null,
+      "scale": null,
+      "mysql": {
+        "columnName": "name",
+        "dataType": "varchar",
+        "dataLength": 7,
+        "dataPrecision": null,
+        "dataScale": null,
+        "nullable": "N"
+      }
+    },
+    "value": {
+      "type": "Number",
+      "required": false,
+      "length": null,
+      "precision": 32,
+      "scale": 0,
+      "mysql": {
+        "columnName": "value",
+        "dataType": "decimal",
+        "dataLength": null,
+        "dataPrecision": 32,
+        "dataScale": 0,
+        "nullable": "Y"
+      }
+    }
+  },
+  "validations": [],
+  "relations": {},
+  "acls": [],
+  "methods": {}
+}

server/model-config.json

@@ -265,6 +265,7 @@
     "dataSource": "ruipeng",
     "public": true
   },
+<<<<<<< HEAD
   "MainBilltotalrevenue": {
     "dataSource": "ruipeng",
     "public": true
@@ -318,6 +319,29 @@
     "public": true
   },
   "MainRegister": {
+=======
+  "HosLastyearbudget": {
+    "dataSource": "ruipeng",
+    "public": true
+  },
+  "HosLastyearregum": {
+    "dataSource": "ruipeng",
+    "public": true
+  },
+  "HosThisyearregum": {
+    "dataSource": "ruipeng",
+    "public": true
+  },
+  "HosThisyearbudget": {
+    "dataSource": "ruipeng",
+    "public": true
+  },
+  "EducCourse4": {
+    "dataSource": "ruipeng",
+    "public": true
+  },
+  "EducBrowse1": {
+>>>>>>> b7fc8bf73da8560743aaf7ceee802056a1f73492
     "dataSource": "ruipeng",
     "public": true
   }