Merge branch 'master' into div

yujian

2019-07-12 b6f6df531ab4fdaf2b800f67eb116323e07797e4

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderRepairHistoryService.java

@@ -7,6 +7,7 @@
   /**

    * 添加记录

    * 

    * 
    * @param history

    */

   public void addOrderRepairHistory(OrderRepairHistory history);