Merge remote-tracking branch 'origin/master'

lin

2024-05-09 b822ea020a6d4edec0d183af32532076cdca062c

 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;
}