Merge branch 'product' into noveltySearch2

src/utils/permissions.js

@@ -9,7 +9,7 @@ export default {
         return true
     }
   const role = Store.state.user.userinfo
-    if(role.roleType === 1){
+    if(role.roleType === 1 || user.roleType == 2){
         return true
     }
     const permissions = Store.getters && Store.getters.permissions