From 14bc2a6463557ad6681c74c1de735a6596557c5f Mon Sep 17 00:00:00 2001
From: chen <chen@example.com>
Date: Thu, 17 Sep 2026 16:57:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B8=85=E7=90=86=E5=88=86=E9=94=80?=
 =?UTF-8?q?=E5=95=86=E8=AF=A6=E6=83=85=E9=A1=B5=E5=8E=86=E5=8F=B2=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/shopro/commission/agent/detail.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/application/admin/view/shopro/commission/agent/detail.html b/application/admin/view/shopro/commission/agent/detail.html
index 2f00cf6..de92569 100644
--- a/application/admin/view/shopro/commission/agent/detail.html
+++ b/application/admin/view/shopro/commission/agent/detail.html
@@ -257,15 +257,10 @@
                                     <el-button class="ml-2" type="primary" link @click="onChangeParentUser">更换
                                     </el-button>
                                 </el-form-item>
-<<<<<<< Updated upstream
                                 <el-form-item v-if="state.data.partner_mode" label="佣金规则:">
                                     <div class="tip" style="color: var(--sa-subfont); line-height: 1.4;">
                                         已切换为收益中心固定金额规则，旧百分比不再生效。
                                     </div>
-=======
-                                <el-form-item v-if="state.data.partner_mode" label="佣金比例:">
-                                    <div class="tip">已切换为收益中心固定金额，旧百分比不再生效。</div>
->>>>>>> Stashed changes
                                 </el-form-item>
                                 <el-form-item v-else label="佣金比例:">
                                     <div class="commission-item">