Merge branch 'main' into multi-tenant

src/modules/network_element/fetch_link/ne_state.go

@@ -15,7 +15,7 @@ import (
 func NeState(neInfo model.NeInfo) (map[string]any, error) {
 	// 网元状态
 	neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/systemState", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType))
-	resBytes, err := fetch.Get(neUrl, nil, 1000)
+	resBytes, err := fetch.Get(neUrl, nil, 2000)
 	if err != nil {
 		logger.Errorf("NeState %s", err.Error())
 		return nil, fmt.Errorf("NeService System State API Error")

src/modules/system/repository/sys_menu.impl.go

@@ -401,7 +401,6 @@ func (r *SysMenuImpl) UpdateMenu(sysMenu model.SysMenu) int64 {
 		params["is_cache"] = "1"
 		params["is_frame"] = "1"
 		params["visible"] = "1"
-		params["status"] = "1"
 	}
 	if sysMenu.MenuType == menu.TYPE_DIR {
 		params["component"] = ""