merge

estateagents.pdman.json

@@ -1197,6 +1197,10 @@
             {
               "fieldName": "relationNoShow",
               "relationNoShow": true
+            },
+            {
+              "fieldName": "uiHint",
+              "relationNoShow": true
             }
           ],
           "chnname": "人员授权项目"
@@ -2534,6 +2538,18 @@
               "type": "Integer",
               "remark": "",
               "chnname": "排序"
+            },
+            {
+              "name": "type_id",
+              "type": "DefaultString",
+              "remark": "",
+              "chnname": "商品分类"
+            },
+            {
+              "name": "type_name",
+              "type": "ShortString",
+              "remark": "",
+              "chnname": "分类名称"
             }
           ],
           "indexs": [],
@@ -3208,7 +3224,9 @@
       }
     ],
     "defaultFieldsType": "2",
-    "javaConfig": {},
+    "javaConfig": {
+      "JAVA_HOME": "D:\\Application\\jdk1.8.0_161"
+    },
     "sqlConfig": ";",
     "dbs": [],
     "wordTemplateConfig": ""