Merge remote-tracking branch 'origin/master'

liusheng

6 天以前 fb9c56894fcee50e17f47253728a4ef0f16a1e0a

 smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java

@@ -39,7 +39,7 @@
     */
    @ApiModelProperty("手术id")
    @Excel(name = "手术id")
    private Long opid;
    private String opid;

    /**
     * 手术名称ID