Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

7 天以前 432508320e929bb5ab37d58e8b8b885174b576c5

 src/main/java/com/ruoyi/project/tool/gen/domain/GenTableColumn.java

@@ -1,6 +1,6 @@
package com.ruoyi.project.tool.gen.domain;



import javax.validation.constraints.NotBlank;

import jakarta.validation.constraints.NotBlank;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.framework.web.domain.BaseEntity;



@@ -138,6 +138,11 @@
        return javaField;

    }



    public String getCapJavaField()

    {

        return StringUtils.capitalize(javaField);

    }



    public void setIsPk(String isPk)

    {

        this.isPk = isPk;