Merge remote-tracking branch 'origin/master'

ui/src/permission.js

@@ -11,7 +11,7 @@ import usePermissionStore from '@/store/modules/permission'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/login', '/register', '/CaSO4_1', '/CaSO4_2', '/CaSO4_3', '/CaSO4_4', '/SeparationTower/SingleGroup', '/HeatExchange', '/IronAlloy', '/m1sj', '/hr', '/m2cl', '/pd']
+const whiteList = ['/login', '/register', '/CaSO4_1', '/CaSO4_2', '/CaSO4_3', '/CaSO4_4', '/SeparationTower/SingleGroup', '/HeatExchange', '/IronAlloy', '/m1sj', '/hr', '/m2cl', '/pd','/flowSelect','/flowSelect/m1','/flowSelect/m2','/flowSelect/paramSetting']
 
 const isWhiteList = (path) => {
   return whiteList.some(pattern => isPathMatch(pattern, path))