Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-04-14 95f9ea7eb339c36cade6c67d0385c49ec2d81477

 zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html

@@ -1568,7 +1568,7 @@
                        if (valid) {


                            if ( _this.form.goodType == '套餐' && _this.form.isCourse == 'Y' && !_this.form.carUseCount) {
                            if ( _this.form.goodType == '套餐' && _this.form.isCourse == 'Y' && _this.form.isInfinite == 'N' && !_this.form.carUseCount) {
                                this.$message.error('请输入套餐最大使用次数！');
                              _this.submiting = false;
                                return false;