Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/entity/taobao/OrderItemHongBao.java

@@ -1,7 +1,7 @@
package com.yeshi.fanli.entity.taobao;



import com.yeshi.fanli.entity.bus.user.HongBao;

import com.yeshi.fanli.entity.bus.user.OrderItem;

import com.yeshi.fanli.dto.HongBao;

import com.yeshi.fanli.dto.order.OrderItem;



public class OrderItemHongBao {

   HongBao hongBao;