Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

昨天 cebef271a105494b4e4e5c09f2d12636d620304c

 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;