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

Merge branch 'feature/099_customer_filter' into 'dev'

See merge request !29

src/i18n/languages/en_US.json

@@ -4524,7 +4524,6 @@
   "礼品ID": "Gift ID",
   "允许兑换次数": "Allow redemption times",
   "已兑换次数": "Redemption times",
-  "剩余次数": "Remaining times",
   "添加礼品": "Add Gift",
   "查看礼品": "View gifts",
   "中文礼品名称": "Chinese gift name",

src/views/ecw/giftManagement/index.vue

@@ -227,7 +227,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        :label="$t('剩余次数')"
+        :label="$t('剩余数量')"
         align="center"
         prop="quantityRemain"
       />

src/views/ecw/memberManagement/exchangeRecordOperation/components/chooseGift.vue

@@ -238,7 +238,7 @@
           prop="exchangeCount"
         ></el-table-column>
         <el-table-column
-          :label="$t('剩余次数')"
+          :label="$t('剩余数量')"
           align="center"
           prop="quantityRemain"
         ></el-table-column>