Commit efc474ac by zhangxingmin

push

parent 671e8810
...@@ -99,6 +99,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper, ...@@ -99,6 +99,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
for (FortuneAccount fortuneAccount : fortuneAccountList) { for (FortuneAccount fortuneAccount : fortuneAccountList) {
FortuneAccountVO fortuneAccountVO = FortuneAccountVO.objToVo(fortuneAccount); FortuneAccountVO fortuneAccountVO = FortuneAccountVO.objToVo(fortuneAccount);
fortuneAccountVO.setFortuneList(GSON.fromJson(fortuneAccount.getContent(), new TypeToken<List<Map<String, Object>>>(){}.getType())); fortuneAccountVO.setFortuneList(GSON.fromJson(fortuneAccount.getContent(), new TypeToken<List<Map<String, Object>>>(){}.getType()));
fortuneAccountVO.setFortuneAccountMonth(fortuneAccount.getFortuneAccountDate());
fortuneAccountVOList.add(fortuneAccountVO); fortuneAccountVOList.add(fortuneAccountVO);
} }
......
...@@ -76,6 +76,13 @@ public class FortuneAccountVO { ...@@ -76,6 +76,13 @@ public class FortuneAccountVO {
private Date fortuneAccountDate; private Date fortuneAccountDate;
/** /**
* 出账月
*/
@Schema(description = "出账月")
@JsonFormat(pattern = "yyyyMM", timezone = "GMT+8")
private Date fortuneAccountMonth;
/**
* 出账信息 * 出账信息
*/ */
@Schema(description = "出账信息") @Schema(description = "出账信息")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment