Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/FormDefinitionReportColumnVo.java
===================================================================
diff -u
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/FormDefinitionReportColumnVo.java	(revision 0)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/FormDefinitionReportColumnVo.java	(revision 33344)
@@ -0,0 +1,85 @@
+package com.forgon.disinfectsystem.jasperreports.javabeansource;
+/**
+ * 2022-03-09
+ * @author zc.li
+ * 表单定义Vo 每个元素属性取最高版本的属性 每个元素的版本可能不一样
+ *
+ */
+public class FormDefinitionReportColumnVo {
+	private String fdiName;
+	private Integer version;
+	private Integer fdiOrderNumber;
+	private Integer fdioOrderNumber;
+	private Integer orderNumber;
+	private String requirement;
+	private Integer width;
+	private String displayFormat;
+	private String value;
+	private String type;
+	
+	public FormDefinitionReportColumnVo() {}
+	public FormDefinitionReportColumnVo(String type) {
+		
+	}
+	public String getFdiName() {
+		return fdiName;
+	}
+	public void setFdiName(String fdiName) {
+		this.fdiName = fdiName;
+	}
+	public Integer getVersion() {
+		return version;
+	}
+	public void setVersion(Integer version) {
+		this.version = version;
+	}
+	public Integer getFdiOrderNumber() {
+		return fdiOrderNumber;
+	}
+	public void setFdiOrderNumber(Integer fdiOrderNumber) {
+		this.fdiOrderNumber = fdiOrderNumber;
+	}
+	public Integer getFdioOrderNumber() {
+		return fdioOrderNumber;
+	}
+	public void setFdioOrderNumber(Integer fdioOrderNumber) {
+		this.fdioOrderNumber = fdioOrderNumber;
+	}
+	public Integer getOrderNumber() {
+		return orderNumber;
+	}
+	public void setOrderNumber(Integer orderNumber) {
+		this.orderNumber = orderNumber;
+	}
+	public String getRequirement() {
+		return requirement;
+	}
+	public void setRequirement(String requirement) {
+		this.requirement = requirement;
+	}
+	public Integer getWidth() {
+		return width;
+	}
+	public void setWidth(Integer width) {
+		this.width = width;
+	}
+	public String getDisplayFormat() {
+		return displayFormat;
+	}
+	public void setDisplayFormat(String displayFormat) {
+		this.displayFormat = displayFormat;
+	}
+	public String getValue() {
+		return value;
+	}
+	public void setValue(String value) {
+		this.value = value;
+	}
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
+	
+}