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

zhanghua

2024-09-28 ceb8e9adae1835a3f8595e71eeb18b5e8f5dd5b9

 ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java

@@ -87,5 +87,5 @@
     * 所属区域
     */
    @TableField("belong_area")
    private Integer belongArea;
    private String belongArea;
}