Merge remote-tracking branch 'origin/master'

baizonghao

2023-03-18 807dc1fff85979874fbfc185918025e6b922ee3c

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

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