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

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java

@@ -134,6 +134,14 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
                 } else {
                     resultDto.setGridName(StrConstant.EPMETY_STR);
                 }
+                //类别变动添加 新增/减少后缀
+                if ("category".equals(resultDto.getType())){
+                    String tempSuffix = "减少";
+                    if (resultDto.getValue().equals(NumConstant.ONE)){
+                        tempSuffix = "增加";
+                    }
+                    resultDto.setTypeName(resultDto.getTypeName().concat(tempSuffix));
+                }
             });
         }
         return new PageData<>(list, pageInfo.getTotal());
@@ -265,4 +273,4 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl<IcUserChangeR
         icUserChangeDetailedService.insertBatch(detailedList);
     }
 
-}
+}