Merge branch 'master' into div

yujian

2019-07-12 e2741d692b5d2e382ae3159a131d54a9ca75aa6f

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

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

    * 添加记录

    * 

    * 
    * @param history

    */

   public void addOrderRepairHistory(OrderRepairHistory history);