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

admin

2020-06-09 afe61a27c4f77db65df66b0ff5dc93cbd3e0014b

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/vipshop/VipShopOrderServiceImpl.java

@@ -78,7 +78,7 @@
      } else {

         detail.setId(old.getId());

         detail.setUpdateTime(new Date());

         vipShopOrderDetailMapper.insertSelective(detail);

         vipShopOrderDetailMapper.updateByPrimaryKey(detail);

         detailId = detail.getId();

      }