Merge remote-tracking branch 'origin/master'

jiangping

2024-11-25 d0fe6ceb4dbb8531e5e7714c5d05d03ec211d3a2

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

@@ -56,10 +56,14 @@
    @ExcelColumn(name="房源编码（关联yw_room)")
    private Integer roomId;

    @ApiModelProperty(value = "合同编码（关联yw_contract)", example = "1")
    @ExcelColumn(name="合同编码（关联yw_contract)")
    @ApiModelProperty(value = "合同编码或账单编码（关联yw_contract)", example = "1")
    @ExcelColumn(name="合同编码或账单编码（关联yw_contract)")
    private Integer contractId;

    @ApiModelProperty(value = "关联类型：0=合同；1=合同账单", example = "1")
    @ExcelColumn(name="关联类型：0=合同；1=合同账单")
    private Integer type;

    @ApiModelProperty(value = "排序码", example = "1")
    @ExcelColumn(name="排序码")
    private Integer sortnum;