conflect fix

Helius

2021-06-11 289b0503bc197d196997142f60b3a8ef8b70f0cc

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html

@@ -947,7 +947,7 @@

                                // if (optionType != 1) {
                                    //直接修改支付金额不重置支付金额
                                    item.payMoney =( zkPrice * count).toFixed(2);
                                    item.payMoney = (zkPrice * count).toFixed(2);
                                // }
                                _this.order.payMoney += parseFloat(item.payMoney);