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

jinpengyong

2021-09-10 c8aa05fd65cc788abc0f44494338b04993e3b4be

 screen-api/src/main/java/com/moral/api/service/OrganizationService.java

@@ -23,4 +23,13 @@
            * @Date: 2021/7/1
            */
    List<Organization> getChildrenOrganizationsById(Integer id);

    /**
    * @Description: 获取国控站组织
            * @Param: []
            * @return: com.moral.api.entity.Organization
            * @Author: 陈凯裕
            * @Date: 2021/7/16
            */
    Organization getStateControlStation();
}