Merge remote-tracking branch 'origin/master'

lin

2024-04-23 2be4713d25c0a295e3f84772dfc3faa0e4930ed2

 src/main/java/org/springblade/modules/pay/entity/OrderInfoEntity.java

@@ -95,6 +95,6 @@

   /** 物业id */
   @ApiModelProperty(value = "物业id", example = "")
   @TableId("proper_id")
   @TableField("proper_id")
   private Long properId;
}