Merge branch 'score_shop' into api_score_meger

jyy

2021-07-14 a2d8b47677fcf9eff87faff1bb89a8674714ddd7

 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>