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

rk

5 天以前 28d2b0a2b33c786670f4999e4b634036de2d6883

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

@@ -78,6 +78,11 @@
    private Integer status;


    @ApiModelProperty(value = "标签明码 加密后生成 rfid_lable", example = "1")
    @ExcelColumn(name="标签明码 加密后生成 rfid_lable")
    private String rfidCode;


    @ApiModelProperty(value = "存放位置", example = "1")
    @TableField(exist = false)
    private String gridCode;