Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-06-18 0de4720110cc7ce35d1565bdd5706d6b9a0b3982

 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);
            })