Merge remote-tracking branch 'origin/develop' into develop

src/components/navMenu/index.vue

@@ -316,11 +316,6 @@
             'icon-class': 'el-icon-s-operation',
             menuId: 'adff323',
             children: [
-              {
-                title: '属性管理',
-                path: '/standLawsAttrManage',
-                menuId: '72a24657972d286b8b5d80735cf4eee2'
-              },
               {
                 title: '操作日志',
                 path: '/OperationLog',
@@ -380,6 +375,11 @@
               //       path: '/DynamicInformations',
               //       menuId: '3C87BSHJUF'
               //     },
+              {
+                title: '属性字典',
+                path: '/standLawsAttrManage',
+                menuId: '72a24657972d286b8b5d80735cf4eee2'
+              },
               {
                 title: '属性配置',
                 path: '/attributeCustom',