Browse Source

Merge remote-tracking branch 'origin/dev_guidance' into develop

master
zxc 4 years ago
parent
commit
4d5c1b6043
  1. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java

2
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java

@ -955,7 +955,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
if (i < NumConstant.TEN){ if (i < NumConstant.TEN){
dto.setMonth(year +"-"+NumConstant.ZERO + String.valueOf(i)); dto.setMonth(year +"-"+NumConstant.ZERO + String.valueOf(i));
}else { }else {
dto.setMonth(year +"-"+ String.valueOf(i) + "月"); dto.setMonth(year +"-"+ String.valueOf(i));
} }
lineChart.add(dto); lineChart.add(dto);
} }

Loading…
Cancel
Save