Merge branch 'master' of https://github.com/java110/MicroCommunity

shiyj

2019-07-16 6d8a43de07062234a05716fcbb94273709cab21e

 java110-code-generator/src/main/java/com/java110/code/web/GeneratorAddComponent.java

@@ -61,7 +61,7 @@
        JSONArray columns = data.getJSONArray("columns");
        for (int columnIndex = 0; columnIndex < columns.size(); columnIndex++) {
            JSONObject column = columns.getJSONObject(columnIndex);
            if (column.getBoolean("hasDefaultValue")) {
            if ("none".equals(column.getString("inputType"))) {
                continue;
            }
            String required = column.getBoolean("required") ? "必填" : "选填";