Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-09 b841224062a2ee8f7ed87872dde7b98ebd8534f1

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireVO.java

File was renamed from springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/ComActQuestnaireVO.java
@@ -1,4 +1,4 @@
package com.panzhihua.common.model.vos.community.questnaire;
package com.panzhihua.common.model.vos.community;

import io.swagger.annotations.ApiModel;
import lombok.Data;