代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

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

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

@Data
@ApiModel("调查问卷 问卷表")
public class ComActQuestnaireDTO {
}
public class ComActQuestnaireDTO {}