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

zhanghua

2022-12-13 f057850aac83d7b154b5b96592ec1c944ebdf375

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