王思川 937e999856 Merge branch 'ps' ... # Conflicts: # XH_Digital_Management/urls.py # application/hrm_mgnt/templates/hrm_mgnt/annual_leave_record.html # application/hrm_mgnt/templates/hrm_mgnt/employee_attendance_records.html # application/hrm_mgnt/templates/hrm_mgnt/employee_information.html # application/hrm_mgnt/templates/hrm_mgnt/positions_table.html # application/hrm_mgnt/templates/hrm_mgnt/ranks_table.html # application/opa_mgnt/templates/opa_mgnt/account_operation_management.html # application/opa_mgnt/templates/opa_mgnt/social_media_account_registration.html # application/opa_mgnt/templates/opa_mgnt/website_maintenance_record.html # application/opa_mgnt/templates/opa_mgnt/website_registration.html # application/org_mgnt/templates/org_mgnt/entity_information_registration.html # application/org_mgnt/templates/org_mgnt/secondary_departments.html # application/org_mgnt/views.py # application/perf_mgnt/views.py # application/rsc_mgnt/templates/rsc_mgnt/business_vehicle_usage_registry.html # application/rsc_mgnt/templates/rsc_mgnt/company_mobile_phone_usage_registry.html # application/rsc_mgnt/templates/rsc_mgnt/consumable_goods_category_management.html # application/rsc_mgnt/templates/rsc_mgnt/consumable_goods_inventory.html # application/rsc_mgnt/templates/rsc_mgnt/membership_accounts_registry.html # application/rsc_mgnt/templates/rsc_mgnt/stored_value_card_registration.html		2024-06-01 11:21:37 +08:00
..
fac_mgnt	Merge branch 'ps'	2024-06-01 11:21:37 +08:00