Commit 715aee08 authored by chenwei's avatar chenwei

Merge branch 'cherry-pick-08db7893' into 'pre-release'

Merge branch 'cherry-pick-761bb895' into 'hotfix/preReleaseDefect'

See merge request !30
parents c0aeb658 5c732dec
......@@ -4524,7 +4524,6 @@
"礼品ID": "Gift ID",
"允许兑换次数": "Allow redemption times",
"已兑换次数": "Redemption times",
"剩余次数": "Remaining times",
"添加礼品": "Add Gift",
"查看礼品": "View gifts",
"中文礼品名称": "Chinese gift name",
......
......@@ -227,7 +227,7 @@
</template>
</el-table-column>
<el-table-column
:label="$t('剩余次数')"
:label="$t('剩余数量')"
align="center"
prop="quantityRemain"
/>
......
......@@ -238,7 +238,7 @@
prop="exchangeCount"
></el-table-column>
<el-table-column
:label="$t('剩余次数')"
:label="$t('剩余数量')"
align="center"
prop="quantityRemain"
></el-table-column>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment