冲突

yujian

2019-08-30 ffbd3afe3806bfdbb13487f6031b938cb1ebcf9b

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

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

    * 添加记录

    * 

    * 
    * @param history

    */

   public void addOrderRepairHistory(OrderRepairHistory history);