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

admin

2019-11-26 e97065519838a1ebbee870eefae6eae9f5d91647

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

@@ -494,6 +494,9 @@
               order.setVipOrder(false);

         } else

            order.setVipOrder(false);

			
         if(order.isVipOrder())

            order.setVipOrderDesc("订单来源：由超级会员的粉丝产生");

      }



      for (CommonOrderVO order : listOrder) {