fix 代充卡密发货以及导出列表

netflix-dao/src/main/java/com/cyksj/model/excel/ExcelRechargeAccountData.java

@@ -61,6 +61,10 @@ public class ExcelRechargeAccountData {
 	@ExcelProperty("密码")
 	private String password;
 
+	@DbField("gr.card_key")
+	@ExcelProperty("卡密")
+	private String cardKey;
+
 	/**
 	 * 联系方式
 	 */

netflix-dao/src/main/java/com/cyksj/model/views/GroupsRelationRechargeView.java

@@ -56,6 +56,12 @@ public class GroupsRelationRechargeView {
 	@DbField("gr.expiry_time")
 	private Date expiryTime;
 
+	/**
+	 * 卡密
+	 */
+	@DbField("gr.card_key")
+	private String cardKey;
+
 	@DbField("gr.recharge_status")
 	private GroupsRelation.RechargeStatus rechargeStatus;
 

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupRelationController.java

@@ -219,6 +219,11 @@ public class CmsGroupRelationController {
         if (StrUtil.isNotEmpty(password)) {
             relation.setPassword(password);
         }
+        //卡密
+        String cardKey = rechargeView.getCardKey();
+        if (StrUtil.isNotBlank(cardKey)) {
+            relation.setPassword(cardKey);
+        }
         String contact = rechargeView.getContact();
         if (StrUtil.isNotBlank(contact)) {
             relation.setContact(contact);