diff --git a/soong_workflow/__manifest__.py b/soong_workflow/__manifest__.py
index e9bb93352..601d939cd 100644
--- a/soong_workflow/__manifest__.py
+++ b/soong_workflow/__manifest__.py
@@ -8,12 +8,14 @@
     "depends": [
         "base",
         "crnd_web_diagram_plus",
-        "yuthon_hr_employee",
+        "hr",
     ],
     "data": [
         "security/soong_workflow_security.xml",
         "security/ir.model.access.csv",
         "views/menuitem.xml",
+        "views/soong_hr_employee_views.xml",
+        "views/yuthon_user_role_views.xml",
         "views/soong_workflow_node_views.xml",
         "views/soong_workflow_link_views.xml",
         "views/soong_workflow_views.xml",
diff --git a/soong_workflow/models/__init__.py b/soong_workflow/models/__init__.py
index 0fc916d1d..a670bc2ea 100644
--- a/soong_workflow/models/__init__.py
+++ b/soong_workflow/models/__init__.py
@@ -6,3 +6,6 @@ from . import soong_workflow_link
 from . import ir_model
 from . import soong_workflow_record
 from . import soong_workflow_mixin
+from . import soong_approval_users
+from . import soong_hr_employee
+from . import soong_user_role
diff --git a/soong_workflow/models/soong_approval_users.py b/soong_workflow/models/soong_approval_users.py
new file mode 100644
index 000000000..1e9832af7
--- /dev/null
+++ b/soong_workflow/models/soong_approval_users.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError, UserError
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+class SoongApprovalUsers(models.Model):
+    _name = "soong.approval.users"
+    _description = "Soong Approval Users"
+
+    approval_user_id = fields.Many2one('res.users', string='审批人')
+    approval_user = fields.Many2one('soong.user.role', string='审批角色')
+    approval_user_datetime = fields.Datetime(string='审批时间')
+    approval_user_notice = fields.Char(string='审批意见')
+    approval_user_sign = fields.Char(string='审批签署')
+    approval_user_state = fields.Selection([('will', '待审批')], string='状态')
diff --git a/soong_workflow/models/soong_hr_employee.py b/soong_workflow/models/soong_hr_employee.py
new file mode 100644
index 000000000..3029231c8
--- /dev/null
+++ b/soong_workflow/models/soong_hr_employee.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models
+
+
+class YuthonHrEmployee(models.Model):
+    """
+    对原模型数据的隐藏，字段的开发和添加
+    """
+    _inherit = "hr.employee"
+
+    user_role_id = fields.Many2one('soong.user.role', string="主角色")
+    user_role_ids = fields.Many2many('soong.user.role', string="辅助角色")
\ No newline at end of file
diff --git a/yuthon_hr_employee/models/yuthon_user_role.py b/soong_workflow/models/soong_user_role.py
similarity index 95%
rename from yuthon_hr_employee/models/yuthon_user_role.py
rename to soong_workflow/models/soong_user_role.py
index 51d65cd0d..d07fe9249 100644
--- a/yuthon_hr_employee/models/yuthon_user_role.py
+++ b/soong_workflow/models/soong_user_role.py
@@ -3,7 +3,7 @@ from odoo import api, fields, models, _
 
 
 class YuthonUserRole(models.Model):
-    _name = 'yuthon.user.role'
+    _name = 'soong.user.role'
 
     name = fields.Char(string="角色名称")
     user_type = fields.Selection([("oa_admin", "OA管理员"),
diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py
index 06deccce0..ee8c7aae0 100644
--- a/soong_workflow/models/soong_workflow_mixin.py
+++ b/soong_workflow/models/soong_workflow_mixin.py
@@ -273,7 +273,7 @@ class SoongWorkflowMixin(models.AbstractModel):
                             if self.env.user not in button.reviewer_group_id.users:
                                 continue
                         elif button.review_type == 'user_role':
-                            user_role_id = self.env['res.users'].search([('employee_id.user_role_id', '=', button.users_role_id)])
+                            user_role_id = self.env['res.users'].search([('employee_id.user_role_id', '=', button.users_role_id.id)])
                             if self.env.user != user_role_id:
                                 continue
                         else:
diff --git a/soong_workflow/models/soong_workflow_node.py b/soong_workflow/models/soong_workflow_node.py
index 97926f3a1..11508beb2 100644
--- a/soong_workflow/models/soong_workflow_node.py
+++ b/soong_workflow/models/soong_workflow_node.py
@@ -227,7 +227,7 @@ class SoongWorkflowNodeButton(models.Model):
     )
     reviewer_id = fields.Many2one(comodel_name="res.users", string="Reviewer")
     reviewer_group_id = fields.Many2one(comodel_name="res.groups", string="Reviewer group")
-    users_role_id = fields.Many2one(comodel_name="yuthon.user.role", string="User Role")
+    users_role_id = fields.Many2one(comodel_name="soong.user.role", string="主角色")
     reviewer_expression = fields.Text(
         string="Review Expression",
         default=CONDITION_CODE_TEMP,
diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index 055ffe5a1..30a626664 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/soong_workflow/models/soong_workflow_record.py
@@ -23,9 +23,7 @@ class SoongWorkflowRecord(models.Model):
     res_model = fields.Char(string="Res Model", required=True)
     res_id = fields.Integer(string="Res ID", required=True)
     workflow_id = fields.Many2one(comodel_name="soong.workflow", string="Workflow Ref.")
-    node_id = fields.Many2one(
-        comodel_name="soong.workflow.node", string="Workflow Node Ref."
-    )
+    node_id = fields.Many2one(comodel_name="soong.workflow.node", string="Workflow Node Ref.")
 
     def open_record(self):
         return {
diff --git a/soong_workflow/security/ir.model.access.csv b/soong_workflow/security/ir.model.access.csv
index a5bde2ae9..7b0558b52 100644
--- a/soong_workflow/security/ir.model.access.csv
+++ b/soong_workflow/security/ir.model.access.csv
@@ -14,4 +14,5 @@ access_soong_workflow_node_field_manager,soong_workflow_node_field_manager,model
 access_soong_workflow_node_button_manager,soong_workflow_node_button_manager,model_soong_workflow_node_button,soong_workflow.group_soong_workflow_manager,1,1,1,1
 access_soong_workflow_link_manager,soong_workflow_link_manager,model_soong_workflow_link,soong_workflow.group_soong_workflow_manager,1,1,1,1
 ,,,,,,,
-access_soong_workflow_record_user,soong_workflow_record_user,model_soong_workflow_record,soong_workflow.group_soong_workflow_user,1,1,1,1
\ No newline at end of file
+access_soong_workflow_record_user,soong_workflow_record_user,model_soong_workflow_record,soong_workflow.group_soong_workflow_user,1,1,1,1
+access_soong_user_role,soong_user_role,model_soong_user_role,soong_workflow.group_soong_workflow_user,1,1,1,1
\ No newline at end of file
diff --git a/soong_workflow/views/soong_hr_employee_views.xml b/soong_workflow/views/soong_hr_employee_views.xml
new file mode 100644
index 000000000..7dde842b5
--- /dev/null
+++ b/soong_workflow/views/soong_hr_employee_views.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_employee_inherit_form_soong" model="ir.ui.view">
+        <field name="name">hr.employee.inherit.del.form</field>
+        <field name="model">hr.employee</field>
+        <field name="inherit_id" ref="hr.view_employee_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='work_email']" position="after">
+                <field name="user_role_id"/>
+                <field name="user_role_ids" widget="many2many_tags"/>
+            </xpath>
+        </field>
+    </record>
+        <record id="view_employee_inherit_tree_soong" model="ir.ui.view">
+        <field name="name">hr.employee.inherit.del.form</field>
+        <field name="model">hr.employee</field>
+        <field name="inherit_id" ref="hr.view_employee_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='work_email']" position="after">
+                <field name="user_role_id"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/yuthon_hr_employee/views/yuthon_user_role_views.xml b/soong_workflow/views/yuthon_user_role_views.xml
similarity index 64%
rename from yuthon_hr_employee/views/yuthon_user_role_views.xml
rename to soong_workflow/views/yuthon_user_role_views.xml
index d872182ab..1362a58f4 100644
--- a/yuthon_hr_employee/views/yuthon_user_role_views.xml
+++ b/soong_workflow/views/yuthon_user_role_views.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <!--  Views  -->
-    <record id="view_yuthon_user_role_tree" model="ir.ui.view">
-        <field name="name">yuthon.user.role.tree</field>
-        <field name="model">yuthon.user.role</field>
+    <record id="view_soong_user_role_tree" model="ir.ui.view">
+        <field name="name">soong.user.role.tree</field>
+        <field name="model">soong.user.role</field>
         <field name="arch" type="xml">
             <tree editable="bottom">
                 <field name="name"/>
@@ -16,16 +16,16 @@
         </field>
      </record>
     <!--  Actions  -->
-    <record id="view_yuthon_user_role_action" model="ir.actions.act_window">
+    <record id="view_soong_user_role_action" model="ir.actions.act_window">
         <field name="name">角色配置</field>
-        <field name="res_model">yuthon.user.role</field>
+        <field name="res_model">soong.user.role</field>
         <field name="view_mode">tree</field>
     </record>
     <!--  Menus  -->
     <menuitem
-        id="menu_yuthon_user_role"
+        id="menu_soong_user_role"
         name="角色配置"
-        action="view_yuthon_user_role_action"
+        action="view_soong_user_role_action"
         parent="hr.menu_config_employee"
         sequence="6"/>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_hr_attendance/__manifest__.py b/yuthon_hr_attendance/__manifest__.py
index 8374b068a..831499117 100644
--- a/yuthon_hr_attendance/__manifest__.py
+++ b/yuthon_hr_attendance/__manifest__.py
@@ -12,7 +12,7 @@
     'category': 'Human Resources/Attendances',
     'sequence': 240,
     'website': 'https://www.pengyuthon.com',
-    'depends': ['hr_attendance', 'resource', 'approvals', 'base', 'hr', 'mail'],
+    'depends': ['hr_attendance', 'resource', 'approvals', 'base', 'hr', 'mail', 'soong_workflow'],
     'data': [
         'security/ir.model.access.csv',
         'security/approval_attendance.xml',
diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py
index 525acfed6..0e771f2ba 100644
--- a/yuthon_hr_attendance/models/hr_attendance.py
+++ b/yuthon_hr_attendance/models/hr_attendance.py
@@ -11,15 +11,9 @@ class HrAttendance(models.Model):
     is_early_card = fields.Boolean(string="是否早退")
     is_late_card = fields.Boolean(string="是否迟到")
     work_time_type = fields.Selection([('close_day', '休息日'), ('work_day', '工作日')], string="工作时间类型")
-    on_card_time = fields.Datetime(string="上班打卡时间")
     on_card_location = fields.Char(string="上班打卡地点")
-    down_card_time = fields.Datetime(string="下班打卡时间")
     down_card_location = fields.Char(string="下班打卡地点")
     out_card_time = fields.Datetime(string="外出打卡时间")
     out_card_location = fields.Char(string="外出打卡地点")
     work_hours = fields.Float(string="工作时长")
-    company_id = fields.Many2one('res.company', string='公司', index=True, default=lambda self: self.env.company)
-
-
-    def send_wecom_attendance(self):
-        pass
\ No newline at end of file
+    company_id = fields.Many2one('res.company', string='公司', index=True, default=lambda self: self.env.company)
\ No newline at end of file
diff --git a/yuthon_hr_attendance/models/overtime_approval.py b/yuthon_hr_attendance/models/overtime_approval.py
index 1248409a4..4a77249e2 100644
--- a/yuthon_hr_attendance/models/overtime_approval.py
+++ b/yuthon_hr_attendance/models/overtime_approval.py
@@ -12,13 +12,14 @@ class OvertimeApprovals(models.Model):
     name = fields.Char(string="名称", default=lambda self: self.env['ir.sequence'].next_by_code('overtime_approval'))
     users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
     overtime_department_id = fields.Many2one('hr.department', string="加班部门")
-    overtime_user_ids = fields.One2many('overtime.user.line', 'overtime_approval_id', string="审批明细行")
+
     reason_application = fields.Char(string="申请事由")
     date = fields.Datetime(string="日期", default=fields.Datetime.now)
     department_id = fields.Many2one('hr.department', string="申请人部门")
     partner_id = fields.Many2one('res.partner', string="来文单位")
-    statu = fields.Selection([('drft', '草稿'), ('going', '执行中'), ('cancel', '已取消'), ('done', '已完成')], string="状态",
-                             default='drft')
+    statu = fields.Selection([('drft', '草稿'), ('going', '执行中'), ('cancel', '已取消'), ('done', '已完成')],
+                             string="状态", default='drft')
+    overtime_user_ids = fields.One2many('overtime.user.line', 'overtime_approval_id', string="加班明细行")
     @api.onchange('overtime_department_id')
     def onchange_overtime_users(self):
         users_data_list = []
@@ -49,9 +50,6 @@ class OvertimeApprovals(models.Model):
                             'compensation_mode': 'salary',
                         }))
             over.overtime_user_ids = users_data_list
-    def go_overtime_approval(self):
-        pass
-
 
 class OvertimeUserLine(models.Model):
     _name = 'overtime.user.line'
diff --git a/yuthon_hr_attendance/views/hr_attendance_views.xml b/yuthon_hr_attendance/views/hr_attendance_views.xml
index f9962902c..152abefd9 100644
--- a/yuthon_hr_attendance/views/hr_attendance_views.xml
+++ b/yuthon_hr_attendance/views/hr_attendance_views.xml
@@ -6,10 +6,6 @@
         <field name="model">hr.attendance</field>
         <field name="arch" type="xml">
             <tree string="出勤" editable="bottom">
-                <header>
-                    <button class="oe_stat_button" name="send_wecom_attendance" string="同步企业微信打卡记录"
-                            groups="hr_attendance.group_hr_attendance_manager" type="object" icon="fa-bars"/>
-                </header>
                 <field name="employee_id" widget="many2one_avatar_user"/>
                 <field name="company_id" optional="show"/>
                 <field name="is_clock_card" optional="show"/>
@@ -17,9 +13,9 @@
                 <field name="is_early_card" optional="show"/>
                 <field name="is_late_card" optional="show"/>
                 <field name="work_time_type" optional="hidden"/>
-                <field name="on_card_time" optional="show"/>
+                <field name="check_in" optional="show"/>
                 <field name="on_card_location" optional="show"/>
-                <field name="down_card_time" optional="show"/>
+                <field name="check_out" optional="show"/>
                 <field name="down_card_location" optional="show"/>
                 <field name="out_card_time" optional="show"/>
                 <field name="out_card_location" optional="show"/>
diff --git a/yuthon_hr_attendance/views/overtime_approval.xml b/yuthon_hr_attendance/views/overtime_approval.xml
index 9548297f5..91f4cf64d 100644
--- a/yuthon_hr_attendance/views/overtime_approval.xml
+++ b/yuthon_hr_attendance/views/overtime_approval.xml
@@ -20,11 +20,6 @@
         <field name="model">overtime.approval</field>
         <field name="arch" type="xml">
             <form>
-<!--                <header>-->
-<!--                    <widget name="attach_document" string="附加文档" action="message_post"/>-->
-<!--                    <button name="go_overtime_approval" string="发起申请" type="object" class="oe_highlight"/>-->
-<!--                    <field name="statu" widget="statusbar"/>-->
-<!--                </header>-->
                 <sheet>
                     <div class="oe_title">
                         <label for="name"/>
diff --git a/yuthon_hr_employee/__manifest__.py b/yuthon_hr_employee/__manifest__.py
index fc0f5d643..db71e7d32 100644
--- a/yuthon_hr_employee/__manifest__.py
+++ b/yuthon_hr_employee/__manifest__.py
@@ -17,11 +17,9 @@
         # 'data/user_role_data.xml',
         'data/yuthon.job.lv.csv',
         'security/ir.model.access.csv',
-        'security/user_role_groups.xml',
         'views/yuthon_hr_employee_views.xml',
         'views/yuthon_hr_department_views.xml',
         'views/yuthon_job_lv_views.xml',
-        'views/yuthon_user_role_views.xml',
         'views/inherit_res_user_views.xml',
         'wizard/hr_employee_wizard_views.xml',
     ],
diff --git a/yuthon_hr_employee/models/__init__.py b/yuthon_hr_employee/models/__init__.py
index f7147e8e8..6538754fb 100644
--- a/yuthon_hr_employee/models/__init__.py
+++ b/yuthon_hr_employee/models/__init__.py
@@ -1,7 +1,6 @@
 from . import yuthon_hr_employee
 from . import hr_employee_page
 from . import yuthon_job_lv
-from . import yuthon_user_role
 from . import yuthon_hr_department
 from . import inherit_res_user
 
diff --git a/yuthon_hr_employee/models/yuthon_hr_employee.py b/yuthon_hr_employee/models/yuthon_hr_employee.py
index 29e07f22a..c5d9428b6 100644
--- a/yuthon_hr_employee/models/yuthon_hr_employee.py
+++ b/yuthon_hr_employee/models/yuthon_hr_employee.py
@@ -26,8 +26,6 @@ class YuthonHrEmployee(models.Model):
                                       ('part_time', '兼职人员'), ('practice', '正式工')], string="用工形式")
     user_number = fields.Char(string="员工编号")
     job_lv_id = fields.Many2one('yuthon.job.lv', string="最新职级")
-    user_role_id = fields.Many2one('yuthon.user.role', string="主角色")
-    user_role_ids = fields.Many2many('yuthon.user.role', string="辅助角色")
     # 个人信息
     user_salary = fields.Float(string="基本工资")
     job_lv_salary = fields.Float(string="职级工资")
diff --git a/yuthon_hr_employee/security/ir.model.access.csv b/yuthon_hr_employee/security/ir.model.access.csv
index 9ae05d8c9..a98c9c106 100644
--- a/yuthon_hr_employee/security/ir.model.access.csv
+++ b/yuthon_hr_employee/security/ir.model.access.csv
@@ -1,6 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_yuthon_job_lv,yuthon_job_lv,model_yuthon_job_lv,base.group_user,1,1,1,1
-access_yuthon_user_role,yuthon_user_role,model_yuthon_user_role,base.group_user,1,1,1,1
 access_yuthon_hr_employee_wizard,yuthon_hr_employee_wizard,model_yuthon_hr_employee_wizard,base.group_user,1,1,1,1
 access_yuthon_emergency_contact_line,yuthon_emergency_contact_line,model_yuthon_emergency_contact_line,base.group_user,1,1,1,1
 access_yuthon_work_experience_line,yuthon_work_experience_line,model_yuthon_work_experience_line,base.group_user,1,1,1,1
diff --git a/yuthon_hr_employee/security/user_role_groups.xml b/yuthon_hr_employee/security/user_role_groups.xml
deleted file mode 100644
index e8894efe4..000000000
--- a/yuthon_hr_employee/security/user_role_groups.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <data>
-        <record id="yuthon_user_role_company_rule" model="ir.rule">
-            <field name="name">角色多公司权限</field>
-            <field name="model_id" ref="model_yuthon_user_role"/>
-            <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
index 5dec9d634..321c196b9 100644
--- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
@@ -96,11 +96,6 @@
             <xpath expr="//group[@name='identification_group']" position="attributes">
                 <attribute name="invisible">1</attribute>
             </xpath>
-            <!--  人事字段的添加-form  -->
-            <xpath expr="//field[@name='work_email']" position="after">
-                <field name="user_role_id"/>
-                <field name="user_role_ids" widget="many2many_tags"/>
-            </xpath>
             <xpath expr="//field[@name='job_id']" position="after">
                 <field name="number"/>
                 <field name="user_number"/>
@@ -213,9 +208,6 @@
             <xpath expr="//field[@name='parent_id']" position="attributes">
                 <attribute name="string">上级领导</attribute>
             </xpath>
-            <xpath expr="//field[@name='work_email']" position="after">
-                <field name="user_role_id"/>
-            </xpath>
         </field>
     </record>
 
diff --git a/yuthon_hr_employee/wizard/hr_employee_wizard.py b/yuthon_hr_employee/wizard/hr_employee_wizard.py
index 1a1ce59c2..7ead40757 100644
--- a/yuthon_hr_employee/wizard/hr_employee_wizard.py
+++ b/yuthon_hr_employee/wizard/hr_employee_wizard.py
@@ -54,11 +54,11 @@ class YuthonHrEmployeeWizard(models.Model):
         role_data = row[5].value
         role_list_ids = []
         for user in role_data.split('，'):
-            user_role = self.env['yuthon.user.role'].search([('name', '=', user)])
+            user_role = self.env['soong.user.role'].search([('name', '=', user)])
             if user_role:
                 role_list_ids.append(user_role.id)
             else:
-                new_user_role = self.env['yuthon.user.role'].create({'name': user})
+                new_user_role = self.env['soong.user.role'].create({'name': user})
                 role_list_ids.append(new_user_role.id)
         employee_data = {
             'name': employee_name.name,