Merge branch 'master' into xin

xin

5 days ago 8a7f9301f4b9e6fcd4e1b3014fb8c5d52820e179

 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);
}