From bee0055f9d33ec0e8cd307c7b087e64f96f7a750 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 26 十二月 2024 18:43:36 +0800
Subject: [PATCH] 1、一个springboot模块只能有一个listener,所以删除OrgListener.java 2、IC卡充值和消费日、月、年自动化统计,农户充值和消费日、月、年自动化统计中数据库查询一般返回list的bug修改

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
index 6f977b5..ea6ef9e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrController.java
@@ -3,6 +3,7 @@
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dy.common.po.BaseEntity;
@@ -65,6 +66,13 @@
     private String protocol;
 
     /**
+     * 閫氳鍗忚鐗堟湰鍙�
+     */
+    @Schema(description = "鍗忚鐗堟湰鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "鍗忚鐗堟湰鍙�")
+    public Integer protocolVersion;
+
+    /**
      * 鍙戠幇鏃ユ湡鏃堕棿
      */
     @Schema(description = "鍙戠幇鏃ユ湡鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@@ -99,4 +107,12 @@
      */
     @Schema(description = "鍒犻櫎鏍囪瘑", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Byte deleted;
+
+
+    /////////////////////////////////////////
+    // 闈炴暟鎹簱灞炴��
+    /////////////////////////////////////////
+    @TableField(exist = false)
+    @Schema(description = "鍙栨按鍙g紪鍙�")
+    public String intakeName ;
 }
\ No newline at end of file

--
Gitblit v1.8.0