代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

1
2
3
4
5
6
7
8
9
10
package com.panzhihua.common.model.vos.property;
 
import io.swagger.annotations.ApiModel;
import lombok.Data;
 
@Data
@ApiModel("详情")
public class ComPropertyAlarmDetailVO {
 
}