Merge branch 'master' of http://ngtools.cn:53000/ldeyun/NGTools

# Conflicts:
#	pages/grid/grid.vue
#	pagesPackage/ngtools_Flow/cysllJs.vue

pages/ucenter.vue

@@ -127,11 +127,13 @@
 						// 	}
 						// 	// #endif
 					],
-					[{
+					[
-						"title": this.$t('mine.feedback'),
+					// 	{
-						"to": '/uni_modules/uni-feedback/pages/opendb-feedback/opendb-feedback',
+					// 	"title": this.$t('mine.feedback'),
-						"icon": "help"
+					// 	"to": '/uni_modules/uni-feedback/pages/opendb-feedback/opendb-feedback',
-					}, {
+					// 	"icon": "help"
+					// },
+					{
 						"title": this.$t('mine.settings'),
 						"to": '/pagesPackage/ucenter/settings/settings',
 						"icon": "gear"