Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-26 a988a89e6b0cd75a5df4691eb8196c0ef9513a05

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

@@ -54,5 +54,11 @@
   private Integer goodsNum;
   @ApiModelProperty("商品信息")
   private String goodsJson;
   @ApiModelProperty("核销时间")
   private String writeOffTime;
   @ApiModelProperty("服务技师")
   private String technicianName;
   @ApiModelProperty("分佣金额")
   private BigDecimal subcommission;
   
}