Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/db

# Conflicts:
#	estateagents.pdman.json

estateagents.pdman.json

               "type": "Integer",
               "remark": "",
               "chnname": "地图范围"
+            },
+            {
+              "name": "property_developer",
+              "type": "ShortString",
+              "remark": "",
+              "chnname": "楼盘开发商"
+            },
+            {
+              "name": "building_num",
+              "type": "Integer",
+              "remark": "",
+              "chnname": "楼栋总数"
+            },
+            {
+              "name": "record_name",
+              "type": "DefaultString",
+              "remark": "",
+              "chnname": "备案名"
             }
           ],
           "indexs": [],
           ],
           "chnname": "按钮路由映射表"
         },
+        {
+          "title": "ta_channel_proxy",
+          "fields": [
+            {
+              "name": "channel_id",
+              "type": "Integer",
+              "remark": "",
+              "chnname": "渠道id",
+              "pk": true,
+              "notNull": true,
+              "autoIncrement": true
+            },
+            {
+              "name": "channel_proxy_name",
+              "type": "LongKey",
+              "remark": "",
+              "chnname": "渠道代理商名称"
+            },
+            {
+              "name": "chanel_img",
+              "type": "LongText",
+              "remark": "",
+              "chnname": "渠道logo"
+            },
+            {
+              "name": "channel_name",
+              "type": "DefaultString",
+              "remark": "",
+              "chnname": "联系人"
+            },
+            {
+              "name": "channal_tel",
+              "type": "DefaultString",
+              "remark": "",
+              "chnname": "手机"
+            },
+            {
+              "name": "login_name",
+              "type": "LongKey",
+              "remark": "",
+              "chnname": "账号名"
+            },
+            {
+              "name": "expire_date",
+              "type": "DateTime",
+              "remark": "",
+              "chnname": "有效期"
+            },
+            {
+              "name": "status",
+              "type": "Integer",
+              "remark": "",
+              "chnname": "状态"
+            },
+            {
+              "name": "app_max_num",
+              "type": "Integer",
+              "remark": "",
+              "chnname": "维护小程序数量"
+            },
+            {
+              "name": "create_time",
+              "type": "DateTime",
+              "remark": "",
+              "chnname": "创建时间"
+            }
+          ],
+          "indexs": [],
+          "headers": [
+            {
+              "fieldName": "chnname",
+              "relationNoShow": false
+            },
+            {
+              "fieldName": "name",
+              "relationNoShow": false
+            },
+            {
+              "fieldName": "type",
+              "relationNoShow": false
+            },
+            {
+              "fieldName": "dataType",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "remark",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "pk",
+              "relationNoShow": false
+            },
+            {
+              "fieldName": "notNull",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "autoIncrement",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "defaultValue",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "relationNoShow",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "uiHint",
+              "relationNoShow": true
+            }
+          ],
+          "chnname": "渠道代理表"
+        },
         {
           "title": "sys_sms_setting",
           "fields": [
             }
           ],
           "chnname": "短信模板设置"
+        },
+        {
+          "title": "ta_channel_app_relation",
+          "fields": [
+            {
+              "name": "relation_id",
+              "type": "Integer",
+              "remark": "",
+              "chnname": "关系id",
+              "pk": true,
+              "notNull": true,
+              "autoIncrement": true
+            },
+            {
+              "name": "channel_id",
+              "type": "Integer",
+              "remark": "",
+              "chnname": "渠道id"
+            },
+            {
+              "name": "org_id",
+              "type": "Integer",
+              "remark": "",
+              "chnname": "公司id"
+            },
+            {
+              "name": "create_time",
+              "type": "DateTime",
+              "remark": "",
+              "chnname": "创建时间"
+            }
+          ],
+          "indexs": [],
+          "headers": [
+            {
+              "fieldName": "chnname",
+              "relationNoShow": false
+            },
+            {
+              "fieldName": "name",
+              "relationNoShow": false
+            },
+            {
+              "fieldName": "type",
+              "relationNoShow": false
+            },
+            {
+              "fieldName": "dataType",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "remark",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "pk",
+              "relationNoShow": false
+            },
+            {
+              "fieldName": "notNull",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "autoIncrement",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "defaultValue",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "relationNoShow",
+              "relationNoShow": true
+            },
+            {
+              "fieldName": "uiHint",
+              "relationNoShow": true
+            }
+          ],
+          "chnname": "渠道小程序关系表"
         }
       ],
       "graphCanvas": {