From b9675b8776553828294bc635879d317b7bb83cc2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 29 十一月 2023 20:09:52 +0800
Subject: [PATCH] 1、meterNo改为rtuAddr; 2、去掉一些main方法; 3、pom.xml中依赖common和global的<scope>provided</scope>改为<scope>compile</scope> 4、pipIrr-mwTest-server一些修改; 5、.gitignore文件提交。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
index 0b3ddff..9398b38 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
@@ -76,7 +76,7 @@
     order by id DESC
     <trim prefix="limit " >
       <if test="start != null and count != null">
-        #{start,jdbcType=INTEGER}, #{count,jdbcType=INTEGER}
+        #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
       </if>
     </trim>
   </select>

--
Gitblit v1.8.0