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

lizijie

2021-09-16 86c06b0f6f30099b436814ab223121aa8239081a

 screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java

@@ -27,6 +27,7 @@
    @Autowired
    OrganizationMapper organizationMapper;


    @Override
    public List<Organization> getChildrenOrganizationsById(Integer id) {
        List<Organization> childrenOrganization = new ArrayList<>();