From cfdaaae8690e188f6971057259873aa408ebc9e3 Mon Sep 17 00:00:00 2001 From: Crunchy <3114200645@qq.com> Date: 星期四, 25 四月 2024 16:49:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java index 9950112..d6fcac0 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java @@ -34,12 +34,18 @@ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") private String entrustCode; + @ValueTableShow(2) + @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + @ApiModelProperty(value = "妫�楠岀被鍒�") + @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + private String orderType; + /** * 涓嬪崟瀹㈡埛 */ @ValueTableShow(3) @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") - @ApiModelProperty("涓嬪崟瀹㈡埛") + @ApiModelProperty("濮旀墭瀹㈡埛") @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") private String custom; @@ -48,9 +54,15 @@ */ @ValueTableShow(4) @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") - @ApiModelProperty("涓嬪崟鍗曚綅") + @ApiModelProperty("濮旀墭鍗曚綅") @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") private String company; + + @ValueTableShow(4) + @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + @ApiModelProperty("鑱旂郴鏂瑰紡") + @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255") + private String phone; /** * 宸ュ巶鍩� @@ -79,6 +91,14 @@ // @ValueTableShow(7) @ApiModelProperty("妫�楠岀粨鏋�") private Integer insResult; + + @ValueTableShow(7) + @ApiModelProperty("鏍峰搧澶勭悊鏂瑰紡") + private Integer processing; + + @ValueTableShow(7) + @ApiModelProperty("鏄惁鐣欐牱") + private Integer isLeave; /** * 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿� @@ -171,4 +191,10 @@ @ValueTableShow(value = 14, name = "閫�鍥炵悊鐢�") private String tell; + @ValueTableShow(value = 15, name = "鎶ュ憡鍙戦�佹柟寮�") + private Integer send; + + @ValueTableShow(value = 16, name = "鏉ユ牱鏂瑰紡") + private String formType; + } -- Gitblit v1.9.3