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

935090232@qq.com

2021-05-19 23f5815a2327bde2a5259be3e83909c1aee94105

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

@@ -128,6 +128,7 @@
                    <template slot-scope="scope">
                        {{scope.row.awardName}}
                        <span v-if="scope.row.awardType == 3">({{scope.row.couponName}})</span>
                        <span v-if="scope.row.awardType == 2">(*{{scope.row.scoreCnt}})</span>
                    </template>
                </el-table-column>
            </el-table>