Merge remote-tracking branch 'origin/master'

fuliqi

2023-12-04 38b44e0c9996f06524903417f1d0a3f746b4550b

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

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

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