From 9cffe03d76840520bfbfeaf85933fcb2ed8385b8 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 05 三月 2025 10:19:46 +0800
Subject: [PATCH] feat(generallibrary): 新增主界面和相关功能模块 - 新增 MainActivity 作为主界面,包含三个底部导航栏选项卡- 新增 BSCardFragment、RechargeFragment 和 MyFragment 作为三个选项卡对应的页面 - 新增 NewCardActivity 用于新建卡片 - 新增 AreaCard 类用于处理区域表号卡数据 - 新增 BaseCard 类作为卡片数据的基础类 - 新增 TabAdapter 用于管理选项卡页面 - 更新 AndroidManifest.xml 设置主活动为 MainActivity - 更新 build.gradle 添加 generallibrary 依赖

---
 qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/utils/ExcelUtil.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/utils/ExcelUtil.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/utils/ExcelUtil.java
index 2b82c1d..beefc7a 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/utils/ExcelUtil.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/utils/ExcelUtil.java
@@ -132,7 +132,7 @@
                         RechargeBean projectBean = (RechargeBean) objList.get(j);
                         list.add(projectBean.getSerial());
                         list.add(projectBean.getUserName());
-                        list.add(projectBean.getOrderID());
+                        list.add(projectBean.getCardNumber());
                         list.add(DateUtil.dateToStamp(projectBean.getDate(), DateUtil.type2));
                         list.add(projectBean.getMorny());
                         list.add(projectBean.getBalance());
@@ -141,6 +141,7 @@
                         list.add(userCardBean.getSerial());
                         list.add(userCardBean.getUserName());
                         list.add(userCardBean.getUserID());
+                        list.add(userCardBean.getCardNumber());
                         list.add(DateUtil.dateToStamp(userCardBean.getDate(), DateUtil.type2));
                         list.add(userCardBean.getPhone());
                     }

--
Gitblit v1.8.0