Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2022-02-18 4506cc81e35921635299078ca24f7dfc92408e1c

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

@@ -1696,7 +1696,7 @@
                        _this.userAdbleEdit();

                        //如果是总产品加载总部分类信息
                        _this.getShoppinggoodscategory(1);
                        // _this.getShoppinggoodscategory(1);
                        _this.getGoodstype(1);
                    }
                });