Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev

.env.development

@@ -10,7 +10,7 @@ VITE_PUBLIC_PATH = /
 # 如果接口地址匹配到，则会转发到http://localhost:3000，防止本地出现跨域问题
 # 可以有多个，注意多个不能换行，否则代理将会失效
 #VITE_PROXY = [["/api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]]
-VITE_PROXY=[["/api","http://10.10.2.102:9500"]]
+VITE_PROXY=[["/api/magic-api/", "http://127.0.0.1:8097","/magic-api/"], ["/api","http://10.10.2.102:9500"]]
 #VITE_PROXY=[["/api/system/generator/","http://127.0.0.1:8091/system/generator/"],["/api/system/file/","http://127.0.0.1:8091/system/file/"],["/api/system/oss/","http://127.0.0.1:8091/system/oss/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]]
 #VITE_PROXY=[["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]]
 #VITE_PROXY=[["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api","http://10.10.2.102:9500"]]

src/views/workflow/design/bpmn/config/propertyConfig.ts

@@ -240,15 +240,15 @@ const UserProperties = {
       buttonGroup: '',
       index: 6
     },
-    {
-      buttonType: ButtonType.DEFAULT, //按钮类型
-      buttonName: t('结束'), //按钮名称
-      buttonCode: ApproveCode.FINISH, //按钮编码
-      approveType: ApproveType.FINISH, //
-      checked: true, //选中
-      buttonGroup: '更多',
-      index: 7
-    },
+    // {
+    //   buttonType: ButtonType.DEFAULT, //按钮类型
+    //   buttonName: t('结束'), //按钮名称
+    //   buttonCode: ApproveCode.FINISH, //按钮编码
+    //   approveType: ApproveType.FINISH, //
+    //   checked: true, //选中
+    //   buttonGroup: '更多',
+    //   index: 7
+    // },
     {
       buttonType: ButtonType.DEFAULT, //按钮类型
       buttonName: t('查看流程图'), //按钮名称

src/views/workflow/design/bpmn/config/sequenceConfig.ts

@@ -66,7 +66,7 @@ export const buttons = [
   },
   {
     key: ApproveCode.REJECT,
-    title: t('拒绝'),
+    title: t('驳回'),
   },
 ];
 // 与或非