Merge remote-tracking branch 'origin/master'

jiangping

2024-01-05 cb6874174975a370cb60f1557704c9d49a05f9e6

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

@@ -48,10 +48,6 @@
    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;

    @ApiModelProperty(value = "卡类型 0IC卡 1CPU卡  2远距离卡 3M卡")
    @ExcelColumn(name="卡类型 0IC卡 1CPU卡  2远距离卡 3M卡")
    private Integer type;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    private String remark;