From 8287f743a1ac2fd5330f6dd7ca08255df193ae03 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Fri, 09 Jul 2021 20:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html
index 1d204ba..d3837fd 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html
@@ -253,7 +253,7 @@
 								goodsCash: 0,
 								achieveType : _this.achieveTypeList[0].value,
 								commission : 0,
-								isShare: false,
+								isShare: false
 							});
 						}
 					});
@@ -309,6 +309,7 @@
 						goodsCash: achieve.goodsCash,
 						achieveType: achieve.achieveType,
 						projPercentage: achieve.commission,
+						payMethod:"现金",
 					};
 					achaeveList.push(achieveNew);
 				})

--
Gitblit v1.9.1