Merge branch 'holiday-price' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java

@@ -226,6 +226,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                         sellingWater.setWaiting(1);
                         sellingWater.setStatus(1);
                         sellingWater.setCommission(commission);
+                        sellingWater.setId(null);
                         insertSelective(sellingWater);
                         log.info("租车订单完成计算用户拥成功----payOrderWater--------userId===" + userId);
                         amount = amount.subtract(commission);