Merge branch 'tzy2' into wxr6

wxr

2021-06-09 ffdeae1a43e1539f9533f93d64089994db6c742b

 HDL_ON/Entity/Function/Function.cs

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using HDL_ON.Common;
using HDL_ON.DAL.Server;
@@ -1169,7 +1169,6 @@
        /// 毫米波传感器
        /// </summary>
        public const string SenesorMegahealth = "sensor.megahealth";


        /// <summary>
        /// 安防传感器spk列表