From b9c75c5d05a2bbccd9eb8ff2028d94779b81bd4e Mon Sep 17 00:00:00 2001 From: iris_cx Date: Mon, 10 Jul 2023 10:13:38 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'jenkinsfilenew=5Fapi'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jenkinsfilenew_api | 1 - 1 file changed, 1 deletion(-) diff --git a/jenkinsfilenew_api b/jenkinsfilenew_api index e60983c..5283be4 100644 --- a/jenkinsfilenew_api +++ b/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 ''' } From 71308aa056c86171981a95122e8230780482c646 Mon Sep 17 00:00:00 2001 From: zhaobing Date: Tue, 18 Jul 2023 08:45:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E5=AF=BC=E8=88=AA=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/service/nav-item.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/client/src/sections/service/nav-item.jsx b/web/client/src/sections/service/nav-item.jsx index e4037e0..92ad32d 100644 --- a/web/client/src/sections/service/nav-item.jsx +++ b/web/client/src/sections/service/nav-item.jsx @@ -55,7 +55,7 @@ export function getNavItem (user, dispatch) { itemKey: 'serviceRecord', text: '硬件维修', icon: , - to: '/service/serviceRecord/serviceRecord1', + to: '/service/serviceRecord/MaintenanceRecords', items: [{ itemKey:'MaintenanceRecords',to:'/service/serviceRecord/MaintenanceRecords',text:'维修记录'}] } ]