Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20251104110749-现金管理二期' into milestone-20251104-现金管理二期

src/main/java/com/example/demo/domain/entity/User.java

@@ -28,6 +28,7 @@ public class User implements Serializable {
     private String name; // 客户姓名
     @ExcelProperty("所属地区")
     private String market; // 所属地区
+    @ExcelIgnore
        private String marketName; // 所属地区
     @ExcelIgnore
     private BigDecimal sumPermanentGold; // 历史永久金币

src/main/java/com/example/demo/domain/vo/cash/CashCollection.java

@@ -30,6 +30,7 @@ public class CashCollection implements Serializable {
     @ExcelProperty("序号")
     private Integer id;
     //订单信息
+    @ExcelIgnore
     private Integer orderType;          // 订单类型：1-收款，2-退款
     @ExcelProperty("精网号")
     private Integer jwcode;             // 精网号
@@ -68,7 +69,7 @@ public class CashCollection implements Serializable {
     private BigDecimal receivedAmount;  // 到账金额
     @ExcelProperty("手续费")
     private BigDecimal handlingCharge;  // 手续费
-    @ExcelProperty("到账币种")
+    @ExcelProperty("到账地区")
     private String receivedMarket;      //到账地区
     // 支付信息
     @ExcelProperty("支付方式")
@@ -90,7 +91,7 @@ public class CashCollection implements Serializable {
     private String submitterName;        // 提交人 姓名
     @ExcelProperty("转账凭证")
     private String voucher;             // 转账凭证
-    @ExcelIgnore
+    @ExcelProperty("备注")
     private String remark;              // 备注
     @ExcelIgnore
     private String receivedRemark;      //到账备注

src/main/java/com/example/demo/domain/vo/coin/GoldUser.java

@@ -1,5 +1,6 @@
 package com.example.demo.domain.vo.coin;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
@@ -56,5 +57,6 @@ public class GoldUser {
     @ExcelProperty("首充日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date firstRecharge; // 首充日期
+    @ExcelIgnore
     private List<String> markets; // 地区列表
 }

src/main/java/com/example/demo/domain/vo/coin/RechargeActivity.java

@@ -1,5 +1,6 @@
 package com.example.demo.domain.vo.coin;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
@@ -30,7 +31,7 @@ public class RechargeActivity {
 
     @ExcelProperty("业绩归属地")
     private String businessBelong; // 业绩归属地
-
+    @ExcelIgnore
     private String area; // 地区
 
     @ExcelProperty("地区")