Merge remote-tracking branch 'origin/api' into api

935090232@qq.com

2021-01-06 6a2d3e41099a782770f2aa0f648061ac0bd2d4ce

 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;