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

# Conflicts:
#	estateagents.pdman.json

estateagents.pdman.json

             {
               "fieldName": "relationNoShow",
               "relationNoShow": true
+            },
+            {
+              "fieldName": "uiHint",
+              "relationNoShow": true
             }
           ],
           "chnname": "分享表"
           "chnname": "小程序图标表"
         },
         {
-          "title": "ta_housing_resources",
+          "title": "ta_share_count",
           "fields": [
             {
-              "name": "house_id",
+              "name": "share_count_id",
               "type": "Integer",
               "remark": "",
-              "chnname": "房源id",
+              "chnname": "分享id",
               "pk": true,
               "notNull": true,
               "autoIncrement": true
             },
             {
-              "name": "building_id",
+              "name": "person_id",
               "type": "LongKey",
               "remark": "",
-              "chnname": "楼盘id"
-            },
-            {
-              "name": "block",
-              "type": "DefaultString",
-              "remark": "与楼盘区分",
-              "chnname": "楼栋"
-            },
-            {
-              "name": "unit",
-              "type": "DefaultString",
-              "remark": "",
-              "chnname": "单元"
-            },
-            {
-              "name": "floor",
-              "type": "DefaultString",
-              "remark": "",
-              "chnname": "层"
-            },
-            {
-              "name": "room_number",
-              "type": "DefaultString",
-              "remark": "",
-              "chnname": "房号"
-            },
-            {
-              "name": "price",
-              "type": "Money",
-              "remark": "",
-              "chnname": "价格"
-            },
-            {
-              "name": "heat",
-              "type": "Integer",
-              "remark": "",
-              "chnname": "基础热度"
-            },
-            {
-              "name": "apartment_id",
-              "type": "DefaultString",
-              "remark": "",
-              "chnname": "户型id"
-            },
-            {
-              "name": "status",
-              "type": "DefaultString",
-              "remark": "",
-              "chnname": "状态"
-            },
-            {
-              "name": "org_id",
-              "type": "Integer",
-              "remark": "",
-              "chnname": "公司id"
-            },
-            {
-              "name": "create_date",
-              "type": "DateTime",
-              "remark": "",
-              "chnname": "创建时间"
-            },
-            {
-              "name": "update_date",
-              "type": "DefaultString",
-              "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": "ta_sales_batch",
-          "fields": [
-            {
-              "name": "sales_batch_id",
-              "type": "DefaultString",
-              "remark": "",
-              "chnname": "销售批次id",
-              "pk": true,
-              "notNull": true,
-              "autoIncrement": true
-            },
-            {
-              "name": "org_id",
-              "type": "Integer",
-              "remark": "",
-              "chnname": "公司id"
+              "chnname": "分享人"
             },
             {
-              "name": "building_id",
+              "name": "be_share",
               "type": "LongKey",
               "remark": "",
-              "chnname": "楼盘id"
-            },
-            {
-              "name": "create_date",
-              "type": "DateTime",
-              "remark": "",
-              "chnname": "创建时间"
-            },
-            {
-              "name": "sales_batch_name",
-              "type": "ShortString",
-              "remark": "",
-              "chnname": "销售批次名称"
-            },
-            {
-              "name": "sales_number",
-              "type": "Integer",
-              "remark": "",
-              "chnname": "出售房源数"
-            },
-            {
-              "name": "preselection_start_time",
-              "type": "DateTime",
-              "remark": "",
-              "chnname": "预选开始时间"
-            },
-            {
-              "name": "preselection_end_time",
-              "type": "DateTime",
-              "remark": "",
-              "chnname": "预选结束时间"
-            },
-            {
-              "name": "raise_start_time",
-              "type": "DateTime",
-              "remark": "",
-              "chnname": "认筹开始时间"
-            },
-            {
-              "name": "raise_end_time",
-              "type": "DateTime",
-              "remark": "",
-              "chnname": "认筹结束时间"
-            },
-            {
-              "name": "preselection_switch",
-              "type": "boolean",
-              "remark": "",
-              "chnname": "认筹是否需预选"
-            },
-            {
-              "name": "raise_switch",
-              "type": "boolean",
-              "remark": "",
-              "chnname": "认筹是否需缴费"
-            },
-            {
-              "name": "payment_duration",
-              "type": "Integer",
-              "remark": "单位分钟",
-              "chnname": "缴费时限"
-            },
-            {
-              "name": "exceed_raise_payment_switch",
-              "type": "boolean",
-              "remark": "",
-              "chnname": "是否允许超出认筹结束时间审核缴费"
-            },
-            {
-              "name": "raise_duration",
-              "type": "Integer",
-              "remark": "单位小时",
-              "chnname": "认筹审核时限"
-            },
-            {
-              "name": "exceed_raise_switch",
-              "type": "boolean",
-              "remark": "",
-              "chnname": "允许超出认筹结束时间审核缴费"
-            },
-            {
-              "name": "raise_payment_duration",
-              "type": "Integer",
-              "remark": "单位小时",
-              "chnname": "认筹审核时限"
-            },
-            {
-              "name": "exceed_raise_verify_switch",
-              "type": "boolean",
-              "remark": "",
-              "chnname": "是否允许超出认筹结束时间审核认筹"
-            },
-            {
-              "name": "raise_price",
-              "type": "Money",
-              "remark": "",
-              "chnname": "认筹金额"
-            },
-            {
-              "name": "payment_type",
-              "type": "DefaultString",
-              "remark": "",
-              "chnname": "缴费方式"
-            },
-            {
-              "name": "payment_voucher",
-              "type": "LongText",
-              "remark": "",
-              "chnname": "缴费凭证说明"
-            },
-            {
-              "name": "status",
-              "type": "Integer",
-              "remark": "",
-              "chnname": "发布状态"
-            },
-            {
-              "name": "update_time",
-              "type": "DateTime",
-              "remark": "",
-              "chnname": "修改时间"
-            },
-            {
-              "name": "aerial_view_img",
-              "type": "LongString",
-              "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
+              "chnname": "被分享对象"
             },
             {
-              "fieldName": "uiHint",
-              "relationNoShow": true
-            }
-          ],
-          "chnname": "销售批次表"
-        },
-        {
-          "title": "ta_house_sales",
-          "fields": [
-            {
-              "name": "house_sales_id",
+              "name": "tagert_type",
               "type": "DefaultString",
               "remark": "",
-              "chnname": "房源与销售批次表",
-              "pk": true,
-              "notNull": true,
-              "autoIncrement": true
-            },
-            {
-              "name": "sales_batch_id",
-              "type": "Integer",
-              "remark": "",
-              "chnname": "销售批次id"
-            },
-            {
-              "name": "house_id",
-              "type": "Integer",
-              "remark": "",
-              "chnname": "房源id"
-            },
-            {
-              "name": "create_date",
-              "type": "DateTime",
-              "remark": "",
-              "chnname": "创建时间"
-            },
-            {
-              "name": "org_id",
-              "type": "Integer",
-              "remark": "",
-              "chnname": "公司id"
-            }
-          ],
-          "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": "ta_preselection_record",
-          "fields": [
-            {
-              "name": "preselection_record_id",
-              "type": "Integer",
-              "remark": "",
-              "chnname": "预选记录id",
-              "pk": true,
-              "notNull": true,
-              "autoIncrement": true
+              "chnname": "对象类型"
             },
             {
               "name": "create_date",
               "type": "DateTime",
               "remark": "",
               "chnname": "创建时间"
-            },
-            {
-              "name": "org_id",
-              "type": "Integer",
-              "remark": "",
-              "chnname": "公司id"
-            },
-            {
-              "name": "update_date",
-              "type": "DefaultString",
-              "remark": "",
-              "chnname": "更新时间"
-            },
-            {
-              "name": "house_id",
-              "type": "DefaultString",
-              "remark": "",
-              "chnname": "房源id"
-            },
-            {
-              "name": "user_id",
-              "type": "Integer",
-              "remark": "",
-              "chnname": "用户id"
-            },
-            {
-              "name": "status",
-              "type": "Integer",
-              "remark": "",
-              "chnname": "状态"
-            },
-            {
-              "name": "update_user",
-              "type": "Integer",
-              "remark": "",
-              "chnname": "更新人"
             }
           ],
           "indexs": [],
               "relationNoShow": true
             }
           ],
-          "chnname": "预选记录表"
+          "chnname": "分享技术标"
         }
       ],
       "graphCanvas": {
-        "nodes": [
-          {
-            "shape": "table",
-            "title": "ta_housing_resources",
-            "moduleName": false,
-            "x": 314.3125,
-            "y": 252,
-            "id": "98a310b7"
-          },
-          {
-            "shape": "table",
-            "title": "ta_sales_batch",
-            "moduleName": false,
-            "x": 754.3125,
-            "y": 212,
-            "id": "d7d48d00"
-          },
-          {
-            "shape": "table",
-            "title": "ta_preselection_record",
-            "moduleName": false,
-            "x": -50,
-            "y": 300,
-            "id": "41f845c3"
-          },
-          {
-            "shape": "table",
-            "title": "ta_house_sales",
-            "moduleName": false,
-            "x": 310,
-            "y": -60,
-            "id": "b14213cd"
-          }
-        ],
+        "nodes": [],
         "edges": []
       },
       "associations": []