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

houruijun

2020-08-21 cdf8f1e691531a6fb1c3462d0ad70df7f68c0047

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

@@ -55,8 +55,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() {