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

jyy

2021-04-06 12990a5138e3fa8874a601bfb784a2b1147f0f24

 zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html

@@ -776,7 +776,7 @@
                let _this = this;
                _this.editableTabs[_this.tabIndex-1].content.goodsId = row.id;
                _this.editableTabs[_this.tabIndex-1].content.goodsName = row.name;
                _this.drawerCoupon = false;
                _this.drawerGoods = false;
            },

            //保存