代码合并冲突解决

huanghongfa

2021-08-30 35b9817b1b104a30ff95f54a494678af9badaa16

1
2
3
4
5
6
7
8
package com.panzhihua.common.model.dtos.community;
 
import io.swagger.annotations.ApiModel;
import lombok.Data;
 
@Data
@ApiModel("问卷回答记录内容")
public class ComActQuestnaireAnswerContentDTO {}