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

estateagents.pdman.json

               "type": "LongKey",
               "remark": "",
               "chnname": "经纪人上线"
+            },
+            {
+              "name": "miniapp_id",
+              "type": "DefaultString",
+              "remark": "",
+              "chnname": "来源小程序"
             }
           ],
           "indexs": [],
               "type": "DateTime",
               "remark": "",
               "chnname": "创建时间"
-            },
-            {
-              "name": "user_id",
-              "type": "Integer",
-              "remark": "",
-              "chnname": "用户ID"
             }
           ],
           "indexs": [],
               "type": "DateTime",
               "remark": "",
               "chnname": "创建时间"
-            },
-            {
-              "name": "status",
-              "type": "TINYINT",
-              "remark": "",
-              "chnname": "状态"
             }
           ],
           "indexs": [],
               "type": "Integer",
               "remark": "",
               "chnname": "参与数"
+            },
+            {
+              "name": "is_miniapp",
+              "type": "boolean",
+              "remark": "",
+              "chnname": "是否投放小程序"
+            },
+            {
+              "name": "h5_address",
+              "type": "LongString",
+              "remark": "",
+              "chnname": "H5活动链接"
+            },
+            {
+              "name": "share_img",
+              "type": "LongString",
+              "remark": "",
+              "chnname": "分享图片"
+            },
+            {
+              "name": "share_title",
+              "type": "MiddleString",
+              "remark": "",
+              "chnname": "分享标题"
+            },
+            {
+              "name": "middle_img",
+              "type": "LongString",
+              "remark": "",
+              "chnname": "中间页飞机图"
+            },
+            {
+              "name": "status",
+              "type": "Integer",
+              "remark": "",
+              "chnname": "状态"
             }
           ],
           "indexs": [],
               "type": "TINYINT",
               "remark": "",
               "chnname": "模板字段数"
+            },
+            {
+              "name": "is_subscribe",
+              "type": "boolean",
+              "remark": "",
+              "chnname": "是否订阅消息"
+            },
+            {
+              "name": "tpl_fields",
+              "type": "MiddleString",
+              "remark": "| 分隔",
+              "chnname": "模板字段列表"
             }
           ],
           "indexs": [],
             }
           ],
           "chnname": "按钮路由映射表"
+        },
+        {
+          "title": "sys_sms_setting",
+          "fields": [
+            {
+              "name": "serial_no",
+              "type": "Integer",
+              "remark": "",
+              "chnname": "主键序号",
+              "pk": true,
+              "notNull": true,
+              "autoIncrement": true
+            },
+            {
+              "name": "sms_name",
+              "type": "ShortString",
+              "remark": "",
+              "chnname": "模板名称"
+            },
+            {
+              "name": "sms_type",
+              "type": "ShortString",
+              "remark": "",
+              "chnname": "模板类型"
+            },
+            {
+              "name": "tpl_code",
+              "type": "LongKey",
+              "remark": "",
+              "chnname": "短信模板号"
+            },
+            {
+              "name": "tpl_sign",
+              "type": "Name",
+              "remark": "",
+              "chnname": "模板签名"
+            },
+            {
+              "name": "status",
+              "type": "TINYINT",
+              "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": {