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

rk

6 天以前 8c4dfb07d551ceb372887ff8f22bd1f574d0347b

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

@@ -77,6 +77,12 @@
    @ExcelColumn(name=" 状态 0未绑定 1在位 2借出 3维修保养")
    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;