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

admin

2019-11-15 2a93320d3adf8c72ea127df59d0bdd043917dd79

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

@@ -145,6 +145,7 @@
      return hongBaoV2Mapper.selectByPrimaryKey(id);

   }





   @Transactional

   @Override

   public int addHongBao(List<CommonOrder> commonOrderList, int type) throws HongBaoException {