From f70951d374cc7859c00edbf2685127ae3934529c Mon Sep 17 00:00:00 2001
From: zendwang <wangzhenxian@idadt.com>
Date: 星期一, 05 十二月 2022 17:59:58 +0800
Subject: [PATCH] update 单元格合并判断cellValue是否相等方法调整
---
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
index 1a978d4..280204b 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
@@ -8,7 +8,7 @@
import com.ruoyi.common.utils.StringUtils;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+import org.apache.ibatis.type.JdbcType;
import javax.validation.constraints.NotBlank;
@@ -20,7 +20,6 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("gen_table_column")
public class GenTableColumn extends BaseEntity {
@@ -43,7 +42,7 @@
/**
* 鍒楁弿杩�
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String columnComment;
/**
@@ -65,43 +64,43 @@
/**
* 鏄惁涓婚敭锛�1鏄級
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isPk;
/**
* 鏄惁鑷锛�1鏄級
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isIncrement;
/**
* 鏄惁蹇呭～锛�1鏄級
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isRequired;
/**
* 鏄惁涓烘彃鍏ュ瓧娈碉紙1鏄級
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isInsert;
/**
* 鏄惁缂栬緫瀛楁锛�1鏄級
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isEdit;
/**
* 鏄惁鍒楄〃瀛楁锛�1鏄級
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isList;
/**
* 鏄惁鏌ヨ瀛楁锛�1鏄級
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR)
private String isQuery;
/**
@@ -125,7 +124,7 @@
private Integer sort;
public String getCapJavaField() {
- return StringUtils.uncapitalize(javaField);
+ return StringUtils.capitalize(javaField);
}
public boolean isPk() {
--
Gitblit v1.9.3