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

bingbing

2020-10-27 1d5345f92dbd4aac2b5f68265921bb2529a71b8e

 kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SuperModel.java

@@ -57,8 +57,8 @@
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private String updateUserName;

    @TableField(fill = FieldFill.INSERT)
    private String createUserOrgCode;
//    @TableField(fill = FieldFill.INSERT)
//    private String createUserOrgCode;

    @Override
    protected Serializable pkVal() {