Merge remote-tracking branch 'origin/master'

zengh

2021-08-15 0cab6d8afcc97e8bc94ef200e24d8839281f44c8

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

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