Merge remote-tracking branch 'origin/master'

zhangherong

8 天以前 88055f5966507100a3b3d334ca1eb3cabc02ba14

 db/430设备管理数据库设计.pdma.json

@@ -13631,7 +13631,9 @@
          "attr8": "",
          "attr9": "",
          "id": "1CC43FB0-98B8-4000-91A3-E077BD7EA4E8",
          "baseType": ""
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "type": ""
        }
      ],
      "correlations": [],
@@ -13992,7 +13994,9 @@
          "attr8": "",
          "attr9": "",
          "id": "5B168FA5-7457-48C0-BD48-0D892AE5EBAF",
          "baseType": ""
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
          "type": ""
        },
        {
          "defKey": "training_user_time",
@@ -14018,7 +14022,9 @@
          "attr8": "",
          "attr9": "",
          "id": "6AE68254-FA3D-4CBE-94B4-1A13BDC7DE19",
          "baseType": ""
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "type": ""
        },
        {
          "defKey": "report_id",
@@ -33210,4 +33216,4 @@
      "enable": true
    }
  ]
}
}