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

FYI

See merge request lihong/thmz_system!117

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

@@ -272,6 +272,7 @@ public class YpZdDict {
     //药品医保编码
     @NotColumn
     private String nationalCode;
+    @NotColumn
     private String nationalName;
     //处方限制天数
     @NotColumn