Merge remote-tracking branch 'origin/master'

fuliqi

2023-12-16 12ada3a7e6680d5ab92901410e3cedd9b8077e56

 ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java

@@ -95,5 +95,7 @@
    @ExcelProperty(index = 6, value = "出入城类型")
    private String inOutCityTypeName;

    @ApiModelProperty(value = "所属区域")
    @ExcelProperty(index = 7, value = "所属区域")
    private String belongArea;
}