add

common/models/merchant.json

@@ -12,7 +12,7 @@
   "properties": {
     "id": {
       "type": "String",
-      "required": true,
+      "required": false,
       "length": 36,
       "precision": null,
       "scale": null,
@@ -23,12 +23,11 @@
         "dataPrecision": null,
         "dataScale": null,
         "nullable": "Y"
-      },
-      "isArray": false
+      }
     },
     "name": {
       "type": "String",
-      "required": true,
+      "required": false,
       "length": 65535,
       "precision": null,
       "scale": null,

server/model-config.json

@@ -65,10 +65,6 @@
     "dataSource": "ruipeng",
     "public": true
   },
-  "Merchant": {
-    "dataSource": "ruipeng",
-    "public": true
-  },
   "Order": {
     "dataSource": "ruipeng",
     "public": true
@@ -92,5 +88,9 @@
   "Onlineteachers": {
     "dataSource": "ruipeng",
     "public": true
+  },
+  "Merchant": {
+    "dataSource": "ruipeng",
+    "public": true
   }
 }