From 9c10d5e9ce87f3aa5144e4dc314a7a95fef64691 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 22 Sep 2021 17:55:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management

---
 src/main/java/org/springblade/modules/punish/entity/Punish.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/punish/entity/Punish.java b/src/main/java/org/springblade/modules/punish/entity/Punish.java
index 1613895..bb1e03e 100644
--- a/src/main/java/org/springblade/modules/punish/entity/Punish.java
+++ b/src/main/java/org/springblade/modules/punish/entity/Punish.java
@@ -50,7 +50,7 @@
 	 * 单位id
 	 */
 	@ApiModelProperty(value = "单位id")
-	private Integer deptid;
+	private String deptid;
 	/**
 	 * 处罚类别 0：警告 1：罚款  2：没收违法所得、没收非法财物 3： 责令停业 4：暂扣或者吊销许可证
 	 */
@@ -67,6 +67,8 @@
 	@ApiModelProperty(value = "处罚结果")
 	private String punishresult;
 	private String punisnum;
+	private String jurisdiction;
+	private String penalty;
 	/**
 	 * 处罚日期
 	 */

--
Gitblit v1.9.3