Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fwq

2023-06-30 13f8c7c5a4fedf6b7222f6775d414f6e8bf95ebc

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

@@ -1,5 +1,6 @@
package com.hz.phis.dt.reward;

import com.alibaba.fastjson.JSONArray;
import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;
@@ -18,6 +19,7 @@

    private String code;
    private String titleId;
    private List<String> answer;
    private String title;
    private String[] answer;

}