代码合并冲突解决

huanghongfa

2021-08-30 35b9817b1b104a30ff95f54a494678af9badaa16

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActQuestnaireSubDTO.java

@@ -5,5 +5,4 @@

@Data
@ApiModel("问卷题目")
public class ComActQuestnaireSubDTO {
}
public class ComActQuestnaireSubDTO {}