# Conflicts: # admin/src/app/lang/zh-cn/customer_resources.customer_resources.json # admin/src/app/lang/zh-cn/physical_test.physical_test.json # admin/src/app/lang/zh-cn/physical_test.physical_test_edit.json # admin/src/app/views/customer_resources/customer_resources.vue # admin/src/app/views/physical_test/physical_test.vue # admin/src/app/views/physical_test/physical_test_edit.vue # niucloud/app/adminapi/controller/customer_resources/CustomerResources.php # niucloud/app/adminapi/controller/physical_test/PhysicalTest.php # niucloud/app/adminapi/route/physical_test.php # niucloud/app/model/physical_test/PhysicalTest.php # niucloud/app/service/admin/physical_test/PhysicalTestService.php
