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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

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

    * 添加记录

    * 

    * 
    * @param history

    */

   public void addOrderRepairHistory(OrderRepairHistory history);