From 7d2da5473e143d79df1a695c66ba8369fbd39c4f Mon Sep 17 00:00:00 2001
From: pengyuthon <pengyuthon@163.com>
Date: Thu, 19 Mar 2026 14:43:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_employee/views/yuthon_hr_employee_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
index 989d7bc0a..921a5f9f7 100644
--- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
@@ -148,7 +148,7 @@
             </xpath>
             <xpath expr="//field[@name='department_id']" position="after">
                 <field name="department_ids" widget="many2many_tags"/>
-                <field name="role_group_ids" column_invisible="1" widget="many2many_tags"/>
+                <field name="role_group_ids" widget="many2many_tags"/>
             </xpath>
             <xpath expr="//field[@name='bank_account_id']" position="attributes">
                 <attribute name="invisible">1</attribute>

From 90231f6acca741a51b285b6a66bd537a5af3a826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Thu, 19 Mar 2026 14:55:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=AD=BE=E7=BA=A6=E4=B8=BB=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_employee_approval/models/yuthon_renewal_approval.py   | 2 +-
 .../views/yuthon_renewal_approval_views.xml                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py
index e28ef2aaa..202e478f8 100644
--- a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py
+++ b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py
@@ -24,7 +24,7 @@ class YuthonRenewalApproval(models.Model):
     work_end = fields.Boolean(string="结束")
 
     employee_id = fields.Many2one('hr.employee', string="续签员工")
-    contract_signing_entity = fields.Char(string="合同签约主体")
+    contract_signing_entity = fields.Many2one('yuthon.party.setting', string="合同签约主体")
     card = fields.Char(related='employee_id.identification_id', string="身份证号")
     department1_id = fields.Many2one('hr.department', string="续签部门")
     user_sex = fields.Selection(related='employee_id.user_sex', string="性别")
diff --git a/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml
index 3810f02e1..3f1bff0d1 100644
--- a/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml
+++ b/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml
@@ -66,12 +66,12 @@
                             <field name="card"/>
                             <field name="department1_id" options="{'no_create': True}"/>
                             <field name="current_status"/>
-                            <field name="renewal_date"/>
                         </group>
                         <group>
                             <field name="user_sex"/>
                             <field name="degree"/>
                             <field name="onboard_time"/>
+                            <field name="renewal_date"/>
                         </group>
                     </group>
                     <group string="合同信息">