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

admin

2020-06-30 e40d1c22c7202aac843c66f9ee9cc000744f9e10

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -2381,4 +2381,9 @@
      return commonOrderMapper.listByOrderNo(orderNo);
   }

   @Override
   public CommonOrder getFirstOrder(Long uid) {
      return commonOrderMapper.getFirstOrder(uid);
   }

}