Merge remote-tracking branch 'origin/master'

linwei

2024-01-02 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d

 src/main/java/org/springblade/modules/discuss/entity/UserPublicEnrollEntity.java

@@ -72,8 +72,17 @@

   /** 0否 1是 */
   @ApiModelProperty(value = "0否 1是", example = "")
   @TableField("delete_flag")
   @TableField("deleted_flag")
   @TableLogic
   private Integer deleteFlag;
   private Integer deletedFlag;

   @ApiModelProperty(value = "签名地址", example = "")
   @TableField("signature_path")
   private String  signaturePath;

   /** 门牌地址编码 */
   @ApiModelProperty(value = "门牌地址编码")
   @TableField("house_code")
   private String houseCode;
}