fix 备注

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

@@ -34,4 +34,10 @@ public class ExcelBannedAccountData {
 	 */
 	@ExcelProperty("到期日期")
 	private String expiryTime;
+
+	/**
+	 * 备注
+	 */
+	@ExcelProperty("备注")
+	private String remark;
 }

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

@@ -52,4 +52,7 @@ public class ExcelPrepareAccountData {
 
     @ExcelProperty("同户更新装置")
     private String verifyLink;
+
+    @ExcelProperty("备注")
+    private String remark;
 }

netflix-web/src/main/java/com/cyksj/web/controller/manage/account/CmsAccountController.java

@@ -565,6 +565,7 @@ public class CmsAccountController {
 				} else {
 					at.setExpiryTime(DateUtil.offsetMonth(at.getStartTime(), 1));
 				}
+				at.setRemark(data.getRemark());
 				accountService.save(at);
 				if (at.getSkuId() != null) {
 					//自动配置车队
@@ -1137,6 +1138,9 @@ public class CmsAccountController {
 				if (data.getExpiryTime() != null) {
 					dbAccount.setExpiryTime(DateUtil.parse(data.getExpiryTime()));
 				}
+				if (StrUtil.isNotBlank(data.getRemark())) {
+					dbAccount.setRemark(data.getRemark());
+				}
 				accountService.updateById(dbAccount);
 
 				GroupsTrips groupsTrips = groupsMapper.selectOne(Wrappers.lambdaQuery(GroupsTrips.class)
@@ -1222,6 +1226,7 @@ public class CmsAccountController {
 				insert.setRelateEmail(data.getRelateEmail());
 				//验证链接
 				insert.setVerifyLink(data.getVerifyLink());
+				insert.setRemark(data.getRemark());
 				if (StrUtil.isNotEmpty(data.getOutsidePurchaseStr())) {
 					if (data.getOutsidePurchaseStr().equals("是") || data.getOutsidePurchaseStr().equals("1")) {
 						insert.setOutsidePurchase(true);