From 07814dd376bbeb36d93950eeb93b9e2b6ddc805b Mon Sep 17 00:00:00 2001
From: whychdw <49690745@qq.com>
Date: 星期二, 03 十二月 2019 14:08:46 +0800
Subject: [PATCH] Merge branch 'FBS9600' of http://whychdw@118.89.139.230:10101/r/FBS9600App.git into FBS9600

---
 platforms/android/app/src/main/java/com/fgkj/impl/Battalram_dataImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/platforms/android/app/src/main/java/com/fgkj/impl/Battalram_dataImpl.java b/platforms/android/app/src/main/java/com/fgkj/impl/Battalram_dataImpl.java
index 53ce83a..c62e088 100644
--- a/platforms/android/app/src/main/java/com/fgkj/impl/Battalram_dataImpl.java
+++ b/platforms/android/app/src/main/java/com/fgkj/impl/Battalram_dataImpl.java
@@ -36,8 +36,8 @@
     @Override
     public List serchByCondition(SQLiteDatabase db, Object obj) {
         Battalram_data adata=(Battalram_data)obj;
-        String numsql = "select count(*) from tb_battalram_data where ";
-        String sql="  select * from tb_battalram_data where ";
+        String numsql = "select count(*) from tb_battalarm_data where ";
+        String sql="  select * from tb_battalarm_data where ";
         //鍛婅绫诲瀷
         String typeSqlT=" alm_cleared_type!=? ";
         String typeSqlF=" alm_cleared_type=? ";
@@ -92,7 +92,7 @@
     //鏌ヨ鎵�鏈夌殑鍛婅
     public int serchAllNum(SQLiteDatabase db, Object obj) {
         Battalram_data adata=(Battalram_data)obj;
-        String sql=" select count(*) as allnum from tb_battalram_data where ";
+        String sql=" select count(*) as allnum from tb_battalarm_data where ";
         //鍛婅绫诲瀷
         String typeSqlT="alm_cleared_type!=?";
         String typeSqlF="alm_cleared_type=?";

--
Gitblit v1.9.1