From 001f24d4efd7b818bc2224b976c82faf4f9e564c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十一月 2024 11:25:00 +0800
Subject: [PATCH] 1、通信协议要增加版本号（目的为远程升级准备），原来没有版本号的协议默认为版本号为1，所以调整了程序命名； 2、流浪控制器与控制器数据库表都增加了协议版本号字段； 3、VO中Double和Float类型的属性增加注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
index cbbad3c..ec4f68d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -504,7 +504,7 @@
oh.op_ic_card_no AS openIcNum,
oh.op_ic_card_addr AS openIcAddr,
oh.open_dt AS openTime,
- oh.op_type AS openType_,
+ oh.op_type AS opType,
oh.op_order_no AS openOrderNo,
oh.op_total_amount AS openTotalAmount,
oh.op_remain_money AS openRemainMoney,
@@ -513,7 +513,7 @@
oh.cl_ic_card_no AS closeIcNum,
oh.cl_ic_card_addr AS closeIcAddr,
oh.close_dt AS closeTime,
- oh.cl_type AS closeType_,
+ oh.cl_type AS clType,
oh.cl_this_amount AS closeThisAmount,
oh.cl_this_time AS thisTime,
oh.cl_price AS closePrice,
@@ -522,7 +522,7 @@
oh.cl_total_amount AS closeTotalAmount
FROM rm_open_close_valve_last oh
LEFT JOIN pr_intake inta ON inta.id = oh.intake_id
- LEFT JOIN ba_client cl ON cl.id = oh.client_id
+ LEFT JOIN se_client cl ON cl.id = oh.client_id
<where>
<if test="intakeId != null and intakeId > 0">
AND oh.intake_id = #{intakeId}
--
Gitblit v1.8.0