Merge branch 'dev' of yeshijie/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/org/dao/BaseOrgDao.java

@@ -43,7 +43,7 @@ public interface BaseOrgDao extends PagingAndSortingRepository<BaseOrgDO, String
    @Query("select code as code,name as name from BaseOrgDO where del = 1")
    List<Map<String,Object>> findOrgListBySaasId();
    @Query("select * from BaseOrgDO where del = '1'")
    @Query("select a from BaseOrgDO a where a.del = '1'")
    List<BaseOrgDO> findByAll();
    List<BaseOrgDO> findByCityCode(String cityCode);