Merge branch 'api' into hive2.0

Helius

2021-03-30 f7bfb2fad02329213b3264f146172ed0b2f3e8a3

Merge branch 'api' into hive2.0

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

@@ -894,10 +894,10 @@
                                let count = parseFloat(item.count);
                                let zkPrice = parseFloat(item.zkPrice);

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

                                _this.achieveList.forEach(achieve=>{