Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-11 f78d6645f4f03af39dff8a3663506a55fdf01c03

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/AccountingStrategyOrder.java

@@ -21,8 +21,8 @@
@TableName("t_accounting_strategy_order")
public class AccountingStrategyOrder extends BasePojo {
   
   @ApiModelProperty(value = "主键")
   @TableField(value = "id")
   @ApiModelProperty(value = "策略id")
   @TableId(type = IdType.INPUT, value = "id")
   private Integer id;
   
   @ApiModelProperty(value = "站点id")