Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

无关风月

2025-01-16 d1cab4b2f2690d1331f12f0d9de78bbbf926f390

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageListVo.java

@@ -37,10 +37,18 @@
   private Integer status;
   @ApiModelProperty("配送方式（1=自提，2=快递）")
   private Integer distributionMode;
   @ApiModelProperty("获得分佣")
   private BigDecimal getCommission;
   /**
    * 用户id
    */
   private Long appUserId;
   @ApiModelProperty("售后订单id")
   private String refundPassId;

   private Integer shopId;

   public BigDecimal getGetPoint(){
      return point;
   }
}