代码合并冲突解决

huanghongfa

2021-08-30 35b9817b1b104a30ff95f54a494678af9badaa16

1
2
3
4
5
6
7
8
9
package com.panzhihua.common.model.vos.community.easyPhoto;
 
import lombok.Data;
 
@Data
public class ComActEasyPhotoCountVO {
    private Integer total;
    private Integer today;
}