将开源版本的修改打补丁应用到商业版

2026-04-09 19:33:52 +08:00
parent d94e9c9bc4
commit b52aec1611
111 changed files with 7215 additions and 275 deletions
@@ -0,0 +1,64 @@
+package org.jeecg.modules.test.vo;
+
+import java.util.List;
+import org.jeecg.modules.test.entity.TestMainTable;
+import org.jeecg.modules.test.entity.TestSonTable;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecgframework.poi.excel.annotation.ExcelEntity;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+/**
+ * @Description: test
+ * @Author: jeecg-boot
+ * @Date:   2026-04-03
+ * @Version: V1.0
+ */
+@Data
+@Schema(description="test")
+public class TestMainTablePage {
+
+	/**主键*/
+	@Schema(description = "主键")
+    private java.lang.String id;
+	/**创建人*/
+	@Schema(description = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+	@Schema(description = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+	@Schema(description = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**a字段*/
+	@Excel(name = "a字段", width = 15)
+	@Schema(description = "a字段")
+    private java.lang.String fieldA;
+	/**b字段*/
+	@Excel(name = "b字段", width = 15)
+	@Schema(description = "b字段")
+    private java.lang.String fieldB;
+
+	@ExcelCollection(name="test")
+	@Schema(description = "test")
+	private List<TestSonTable> testSonTableList;
+
+}