WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period

Browse Source
This commit is contained in:
CD
2022-12-30 14:03:00 +08:00
parent d8f6176cbe ffbff1437a
commit ebfac5f334
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
+1 -1
View File
@@ -198,7 +198,7 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
if(dictModelList.size() != 0){ if(dictModelList.size() != 0){
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (DictModel dictModel : dictModelList) { for (DictModel dictModel : dictModelList) {
if(CutEnum.CN.getValue().equals(paramsReportEO)){ if(CutEnum.CN.getValue().equals(paramsReportEO.getCut())){
sb.append(dictModel.getText()+","); sb.append(dictModel.getText()+",");
}else{ }else{
sb.append(dictModel.getTextEn()+","); sb.append(dictModel.getTextEn()+",");
jero-web/src/views/system/UserAnnouncementList.vue
+7 -7
View File
@@ -145,13 +145,13 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
ellipsis: true, ellipsis: true,
scopedSlots: { customRender: 'msgTitile' } scopedSlots: { customRender: 'msgTitile' }
}, },
{ // {
title: this.$t('Sponsor'), // title: this.$t('Sponsor'),
align: 'left', // align: 'left',
ellipsis: true, // ellipsis: true,
dataIndex: 'initiator', // dataIndex: 'initiator',
width: 200 // width: 200
}, // },
{ {
title: this.$t('MessageType'), title: this.$t('MessageType'),
align: 'left', align: 'left',