Merge remote-tracking branch 'origin/maanshan' into maanshan

rk

5 天以前 28d2b0a2b33c786670f4999e4b634036de2d6883

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinet.java

@@ -170,4 +170,9 @@
    @ApiModelProperty(value = "激活文件")
    @TableField(exist = false)
    private Multifile activateFile;


    @ApiModelProperty(hidden = true)
    @TableField(exist = false)
    private String now;
}