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

zhanghua

2022-11-23 9754a0716d3c5227d2351c5b279908afb0ea130f

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

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