Pre Merge pull request !6 from reset/feature/cl

src/com/engine/organization/entity/TopTab.java

@@ -18,7 +18,7 @@ import lombok.NoArgsConstructor;
 public class TopTab {
     private String color;
     private String groupId;
-    private Boolean showCount;
+    private Boolean showcount;
     private String title;
     private String viewCondition;
 
@@ -27,7 +27,7 @@ public class TopTab {
         return "TopTab{" +
                 "color='" + color + '\'' +
                 ", groupid='" + groupId + '\'' +
-                ", showcount='" + showCount + '\'' +
+                ", showcount='" + showcount + '\'' +
                 ", title='" + title + '\'' +
                 ", viewcondition='" + viewCondition + '\'' +
                 '}';

src/com/engine/organization/service/impl/GradeServiceImpl.java

@@ -136,9 +136,9 @@ public class GradeServiceImpl extends Service implements GradeService {
     public Map<String, Object> getTabInfo() {
         Map<String, Object> apiDatas = new HashMap<>();
         List<TopTab> topTabs = new ArrayList<>();
-        topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showCount(true).title("全部").viewCondition("-1").build());
-        topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showCount(true).title("启用").viewCondition("0").build());
-        topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showCount(true).title("禁用").viewCondition("1").build());
+        topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build());
+        topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showcount(true).title("启用").viewCondition("0").build());
+        topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showcount(true).title("禁用").viewCondition("1").build());
         apiDatas.put("topTabs", topTabs);
 
         HashMap<String, Integer> countMap = new HashMap<>();

src/com/engine/organization/service/impl/LevelServiceImpl.java

@@ -136,9 +136,9 @@ public class LevelServiceImpl extends Service implements LevelService {
     public Map<String, Object> getTabInfo() {
         Map<String, Object> apiDatas = new HashMap<>();
         List<TopTab> topTabs = new ArrayList<>();
-        topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showCount(true).title("全部").viewCondition("-1").build());
-        topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showCount(true).title("启用").viewCondition("0").build());
-        topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showCount(true).title("禁用").viewCondition("1").build());
+        topTabs.add(TopTab.builder().color("#000000").groupId("flowAll").showcount(true).title("全部").viewCondition("-1").build());
+        topTabs.add(TopTab.builder().color("#ff3232").groupId("enable").showcount(true).title("启用").viewCondition("0").build());
+        topTabs.add(TopTab.builder().color("#fea468").groupId("disable").showcount(true).title("禁用").viewCondition("1").build());
         apiDatas.put("topTabs", topTabs);
 
         HashMap<String, Integer> countMap = new HashMap<>();