Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

jenkinsfilenew_api

@@ -10,7 +10,6 @@ podTemplate {
 		    
 		    container('image-builder') {			    
 				sh'''
-					find . -depth -name '.svn' -type d -exec rm -rf {} +
 				    /kaniko/executor --context=${BUILD_WORKSPACE} --dockerfile=./api/Dockerfilenew --destination=${IMAGE_NAME}:${IMAGE_VERSION} --cache=false --cleanup 
 			    '''			    
 		    }

web/client/src/sections/service/nav-item.jsx

@@ -55,7 +55,7 @@ export function getNavItem (user, dispatch) {
                   itemKey: 'serviceRecord',
                   text: '硬件维修',
                   icon: <iconpark-icon style={{ width: 20, height: 20 }} name="iconjianshezhong"></iconpark-icon>,
-                  to: '/service/serviceRecord/serviceRecord1',
+                  to: '/service/serviceRecord/MaintenanceRecords',
                   items: [{ itemKey:'MaintenanceRecords',to:'/service/serviceRecord/MaintenanceRecords',text:'维修记录'}]
                }
             ]