Merge branch 'dev-1.1.4' into 'dev-1.1.4'

修复增加反射之外的字段限制

See merge request hurugang/thmz_system!34

src/main/java/cn/hnthyy/thmz/entity/his/yp/YpInDetl.java

@@ -1,6 +1,7 @@
 package cn.hnthyy.thmz.entity.his.yp;
 
 
+import cn.hnthyy.thmz.annotation.NotColumn;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -125,5 +126,6 @@ public class YpInDetl {
   private String acceptId;
   private BigDecimal avgPrice;
   //药品国家医保编码
+  @NotColumn
   private String nationalCode;
 }

src/main/java/cn/hnthyy/thmz/entity/his/yp/YpOutDetl.java

@@ -1,5 +1,6 @@
 package cn.hnthyy.thmz.entity.his.yp;
 
+import cn.hnthyy.thmz.annotation.NotColumn;
 import cn.hnthyy.thmz.pageDto.PageBean;
 import lombok.Data;
 
@@ -95,5 +96,6 @@ public class YpOutDetl extends PageBean {
   //审核人
   private String confirmName;
   //药品国家医保编码
+  @NotColumn
   private String nationalCode;
 }

src/main/java/cn/hnthyy/thmz/entity/his/yp/YpOutDetlYf.java

@@ -1,5 +1,6 @@
 package cn.hnthyy.thmz.entity.his.yp;
 
+import cn.hnthyy.thmz.annotation.NotColumn;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -174,5 +175,6 @@ public class YpOutDetlYf {
 	/**
 	 * 药品国家医保编码
 	 */
+	@NotColumn
 	private String nationalCode;
 }