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

zhanghua

2022-11-28 290a01c4a1eb457e858ca52d7b1c03a6f23e4488

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

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

    @ExcelIgnore
    private String belongArea;
}