Merge branch 'master' of ssh://git.jizhiweb.cn:2222/clinic-v2/server

src/main/java/com/syjiaer/clinic/server/entity/item/vo/ItemSearchVo.java

@@ -24,10 +24,10 @@ public class ItemSearchVo {
     private String updateBy;
 
     @ApiModelProperty("项目名称")
-    private String itemName;
+    private String name;
 
     @ApiModelProperty("项目医保目录编码")
-    private String itemSocialCode;
+    private String socialCode;
 
     @ApiModelProperty("单位")
     private String unit;