Merge remote-tracking branch 'origin/master'

tangzy

2021-11-25 a9ec32e3db22fa4f5f44fa2b68e92862c1f58a5d

 src/main/java/org/springblade/modules/shareholder/entity/Shareholder.java

@@ -85,7 +85,7 @@
   /**
    * 统一社会信用代码
    */
   @ApiModelProperty(value = "统一社会信用代码")
   @ApiModelProperty(value = "社会信用代码")
   @TableField("creditCode")
   private String creditcode;
}