解决冲突

MrShi

2024-11-26 14a20df4699cf3d933e2bdbe1ba2aba15ade1059

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

@@ -115,4 +115,5 @@
    @ApiModelProperty(value = "楼层名称")
    @TableField(exist = false)
    private String floorName;

}