Merge branch 'master' into xin

xin

5 days ago 982313135d1c239fe3b20e4c5664781f92d40aca

 oying-system/src/main/java/com/oying/modules/system/service/DataService.java

@@ -16,5 +16,5 @@
     * @param user /
     * @return /
     */
    List<Long> getDeptIds(User user);
    List<Long> getDataIds(User user);
}