Merge branch 'master' into master-test

wangrenhuang

2023-04-18 32d2c43dd99de3b287cea39cc3bc5f03be233a86

Merge branch 'master' into master-test

 phis-feign/src/main/java/com/hz/phis/dt/reward/AnswerDto.java

@@ -4,6 +4,8 @@
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;

import java.util.List;

/**
 * @ClassName AwardDto
 * @Description 调查问卷提交数据dto
@@ -16,6 +18,6 @@

    private String code;
    private String titleId;
    private String answer;
    private List<String> answer;

}