Merge remote-tracking branch 'origin/master'

admin

2019-06-28 9cdb5e6e3474933536f53720497be9a4764fba4f

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

@@ -684,6 +684,7 @@
      return commonOrderList;

   }



   @Transactional

   @Override

   public List<CommonOrder> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException {

      List<CommonOrder> commonOrderList = new ArrayList<>();