From c238bf89a89eec5030539c12d9902dbbd8ce3851 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 15 三月 2024 08:54:19 +0800
Subject: [PATCH] 序列号显示10进制的

---
 app/src/main/java/com/dayu/recharge/activity/MyActivity.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/dayu/recharge/activity/MyActivity.java b/app/src/main/java/com/dayu/recharge/activity/MyActivity.java
index f2b190a..1d1fe5a 100644
--- a/app/src/main/java/com/dayu/recharge/activity/MyActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/MyActivity.java
@@ -20,6 +20,7 @@
 import com.dayu.recharge.net.SocketNet;
 import com.dayu.recharge.utils.DeviceNumberUtils;
 import com.dayu.recharge.utils.ExcelUtil;
+import com.dayu.recharge.utils.SocketUtil;
 import com.dayu.recharge.utils.TipUtil;
 import com.dayu.recharge.view.PassWordDialog;
 import com.dayu.recharge.view.datepicker.CustomDatePicker;
@@ -162,7 +163,7 @@
                             if (isRechargeList) {
                                 listData = asynchBaseDao.rechargeDao().ansyFindByTime(beginTime, endTime);
                             } else {
-                                listData = baseDao.userCardDao().findByTime(beginTime, endTime);
+                                listData = asynchBaseDao.userCardDao().findByTime(beginTime, endTime);
                             }
                             if (listData == null || listData.size() == 0) {
                                 handler.sendEmptyMessage(2);
@@ -178,7 +179,7 @@
                             return;
                         }
                         if (isRechargeList) {
-                            title = new String[]{"璁惧搴忓垪鍙�", "鐢ㄦ埛鍚�", "韬唤璇佸彿", "鍏呭�兼棩鏈�", "鍏呭�奸噾棰濓紙鍏冿級", "鍓╀綑閲戦锛堝厓锛�"};
+                            title = new String[]{"璁惧搴忓垪鍙�", "鐢ㄦ埛鍚�", "璁㈠崟鍙�", "鍏呭�兼棩鏈�", "鍏呭�奸噾棰濓紙鍏冿級", "鍓╀綑閲戦锛堝厓锛�"};
                             fileName = file.toString() + "/" + ExcelUtil.outRechargePathName;
                         } else {
                             title = new String[]{"璁惧搴忓垪鍙�", "鐢ㄦ埛鍚�", "韬唤璇佸彿", "娉ㄥ唽鏃ユ湡", "鐢佃瘽"};

--
Gitblit v1.8.0