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

zhanghua

2023-03-18 71f3101370c3db0ec00178d51a723816c9bcddbd

 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;
}