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

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrgCapacityServiceImpl.java

@@ -97,7 +97,6 @@ public class OrgCapacityServiceImpl implements OrgCapacityService {
                 content.setShowName(names.get(e.getTeamId()));
                 content.setDate(e.getWorkday())
                         .setLayer(e.getLayer())
-                        .setShowName(e.getTeamId())
                         .setCapTotal(e.getCapTotal())
                         .setCapUsed(e.getCapUsed())
                         .setCapLeft(e.getCapLeft())