Merge branch 'score_shop' into api_score_meger

jyy

2021-07-14 7c92603d6548e7405a298d3c4996942acd999376

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

@@ -177,8 +177,7 @@
                            message: data.info,
                            type: 'success',
                        });
                        parent.layer.close(parent.layer.getFrameIndex(window.name));
                        parent.location.reload();
                        _this.loadInfo();
                    }
                });
            },