Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireTeam.java

 package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -9,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.apache.ibatis.type.JdbcType;
 
 import java.util.Date;
 /**
@@ -41,6 +43,7 @@ public class FireTeam extends BaseEntity {
     private String name;
     
     @ApiModelProperty(value = "父级")
+    @TableField(value = "parent",updateStrategy = FieldStrategy.IGNORED,jdbcType = JdbcType.BIGINT)
     private Long parent;
     
     @ApiModelProperty(value = "父级队伍名称")