Merge remote-tracking branch 'origin/v5' into v5

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/external/company/OutEnterpriseLawEnforcementController.java

@@ -78,9 +78,9 @@ public class OutEnterpriseLawEnforcementController extends BaseController
     /**
      * 查看预约记录详情
      */
-    @GetMapping( "/getById/{id}")
+    @GetMapping( "/getById")
     @ResponseBody
-    public ZDResponse getById(@PathVariable("id") String id)
+    public ZDResponse getById(String id)
     {
         EnterpriseLawEnforcement enterpriseLawEnforcement =
                 enterpriseLawEnforcementService.selectEnterpriseLawEnforcementById(id);