From 4801ae5b97f6be8f5e414a41ee7c80ce5f9c9432 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 22 七月 2026 10:42:59 +0800
Subject: [PATCH] fix: 合并冲突

---
 src/api/officeProcessAutomation/approvalTemplate.js |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/src/api/officeProcessAutomation/approvalTemplate.js b/src/api/officeProcessAutomation/approvalTemplate.js
index 4aef140..3ade018 100644
--- a/src/api/officeProcessAutomation/approvalTemplate.js
+++ b/src/api/officeProcessAutomation/approvalTemplate.js
@@ -4,11 +4,6 @@
 export const TEMPLATE_TYPE_BUILTIN = 0;
 export const TEMPLATE_TYPE_CUSTOM = 1;
 
-export const TEMPLATE_TYPE_OPTIONS = [
-  { value: TEMPLATE_TYPE_BUILTIN, label: "绯荤粺鍐呯疆" },
-  { value: TEMPLATE_TYPE_CUSTOM, label: "鑷畾涔�" },
-];
-
 /** 鏌ヨ鎵�鏈夊鎵规ā鏉� */
 export function listApprovalTemplate(type) {
   return request({

--
Gitblit v1.9.3