Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2022-11-22 68c92dc86cc15ca8d4982a73e7404bd479f2232c

 ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java

@@ -41,7 +41,7 @@

    @GetMapping("/query")
    @ApiOperation("查询")
    @LogSave
    @LogSave(operationType = "卡口管理", contain = "查询卡口")
    public CommonResult search(@RequestParam(required = false) Integer size,
                               @RequestParam(required = false) Integer current,
                               @RequestParam(required = false) String bayonetName) {