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

gongchunyi

6 天以前 f9c24cdd04de07001f078ea093b724e647ac35b2

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

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

    }



    public String getCapJavaField()

    {

        return StringUtils.capitalize(javaField);

    }



    public void setIsPk(String isPk)

    {

        this.isPk = isPk;