Merge remote-tracking branch 'origin/master'

liujie

8 天以前 7342170db7dc39326698d39b74e1858502fd574a

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java

@@ -17,6 +17,7 @@
     * @throws Exception
     */
    ResultUtil saveData(Reassign reassign, Integer uid, Integer type) throws Exception;
    ResultUtil saveDataCancel(Reassign reassign, Integer uid, Integer type) throws Exception;