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

maven

昨天 1cf92e13371b55c4449ccb48b264eea547eccb86

 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;