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

9144c2a3 · 邹磊浩 · ea306fa4 · c8a3c17f · 9144c2a3
Commit 9144c2a3 authored Oct 12, 2023 by 邹磊浩
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

pz-system/src/main/java/com/pz/system/service/impl/SysUserServiceImpl.java
+1 -1

No files found.
--- a/pz-system/src/main/java/com/pz/system/service/impl/SysUserServiceImpl.java
+++ b/pz-system/src/main/java/com/pz/system/service/impl/SysUserServiceImpl.java
@@ -551,7 +551,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
        }else if(dataViewBo.getCondition() == 1){
            dataViewVo.setDataSum(falseData.get(0).getAdminToday().intValue());
        }else {
-            dataViewVo.setDataSum(falseData.get(0).getAdminSeven().intValue());
+            dataViewVo.setDataSum(falseData.get(0).getAdminSum().intValue());
        }
        //return baseMapper.selectDataView(dataViewBo);
        return dataViewVo;