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

wangrenhuang

2023-04-18 dfe372a6c34dbaed2fb4870ab29c18c6983e2d78

 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,6 @@

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

}