Merge remote-tracking branch 'origin/div' into div

yujian

2019-11-20 a2f028be7690813b828e2aeecc0bd1a1f5d25600

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

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

    * 添加记录

    * 

    * 
    * @param history

    */

   public void addOrderRepairHistory(OrderRepairHistory history);