From 08bfe3072377b53c60e0952f00c26bce2e5b4bc0 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 18 六月 2025 17:05:55 +0800
Subject: [PATCH] feat(card): 添加卡片返还功能- 新增 CardReturnActivity 用于执行卡片返还操作 - 在 BSCardFragment 中添加返还按钮,跳转到 CardReturnActivity - 在 CardOperationType 中添加 ReturnCard 类型 - 修改 CardReadActivity,优化卡片信息显示逻辑 - 更新 CardWriteSuccessActivity,支持返还成功提示 - 新增 ic_morny_back 图标用于返还操作

---
 henanlibrary/src/main/java/com/dayu/henanlibrary/dao/AppDatabase.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/dao/AppDatabase.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/dao/AppDatabase.java
index 3f2fc02..7fae578 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/dao/AppDatabase.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/dao/AppDatabase.java
@@ -10,7 +10,6 @@
 import com.dayu.henanlibrary.dbBean.ElectricPriceBean;
 import com.dayu.henanlibrary.dbBean.IdentityBean;
 import com.dayu.henanlibrary.dbBean.IpBean;
-import com.dayu.henanlibrary.dbBean.PassWordBean;
 import com.dayu.henanlibrary.dbBean.PowerBean;
 import com.dayu.henanlibrary.dbBean.RechargeBean;
 import com.dayu.henanlibrary.dbBean.UserCardBean;
@@ -21,13 +20,13 @@
  * Date: 2023-11-05 16:23
  * Description:
  */
-@Database(entities = {CardData.class, DeviceNumber.class, IdentityBean.class, DomainBean.class, ElectricPriceBean.class, IpBean.class, AdminDataBean.class, PassWordBean.class, UserCardBean.class, RechargeBean.class, PowerBean.class}, version = 2, exportSchema = false)
+@Database(entities = {CardData.class, DeviceNumber.class, IdentityBean.class, DomainBean.class, ElectricPriceBean.class, IpBean.class, AdminDataBean.class,  UserCardBean.class, RechargeBean.class, PowerBean.class}, version = com.dayu.baselibrary.dao.AppDatabase.version, exportSchema = false)
 public abstract class AppDatabase extends RoomDatabase {
 
 
     public abstract AdminDataDao adminDao();
 
-    public abstract LoginPsDao loginPsDao();
+
 
     public abstract UserCardDao userCardDao();
 

--
Gitblit v1.8.0