Merge branch 'bugfix-20210127' into 'developer'

Bugfix 20210127

See merge request !161

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java

@@ -105,10 +105,6 @@ public class ClerkController extends WebBaseController {
         List<String> staffIds = list.stream().map(s -> s.getStaffId()).collect(Collectors.toList());
         List<StaffDTO> resultlist = staffApiService.listByIds(staffIds);
         Map<String, StaffDTO> map = com.gic.commons.util.CollectionUtil.toMap(resultlist, "staffId");
-        int size = 0;
-        if (resultlist != null) {
-            size = resultlist.size();
-        }
 
         List<StaffVO> resultList = new ArrayList<>();
         for (StaffClerkRelationDTO staffClerkRelationDTO : list) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/StaffVO.java

@@ -82,7 +82,7 @@ public class StaffVO implements Serializable{
     
     private Boolean weixinPush;
     
-    private Integer memberCount;
+    private int memberCount;
     
     private String clerkId;
 	/**
@@ -304,11 +304,11 @@ public class StaffVO implements Serializable{
 		this.weixinPush = weixinPush;
 	}
 
-	public Integer getMemberCount() {
+	public int getMemberCount() {
 		return memberCount;
 	}
 
-	public void setMemberCount(Integer memberCount) {
+	public void setMemberCount(int memberCount) {
 		this.memberCount = memberCount;
 	}