Merge branch 'dev-2.11.0' of depot-qinghai/depot-device-qinghai into dev

src/main/java/com/chinaitop/depot/device/controller/BusinessImPurchaseSaleController.java

@@ -94,9 +94,9 @@ public class BusinessImPurchaseSaleController {
         return ResponseEntity.ok(businessImPurchaseSaleService.deleteData(id));
     }
 
-    @GetMapping("/getById/{id}")
+    @GetMapping("/getById")
     @ApiOperation(value = "采购销售管理-详情", notes = "id获取详情")
-    public ResponseEntity<BusinessImPurchaseSale> getById(@PathVariable("id") String id) {
+    public ResponseEntity<BusinessImPurchaseSale> getById(String id) {
         return ResponseEntity.ok(businessImPurchaseSaleService.getById(id));
     }