Merge remote-tracking branch 'origin/master'

hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/entity/EmInfoEntity.java

@@ -249,7 +249,4 @@ public class EmInfoEntity extends TenantEntity {
 	@TableField(exist = false)
 	private List<EmInfoEntity> infoChildren;
 
-
-	@ApiModelProperty("固定资产编码")
-	private String assetCode;
 }