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

admin

2020-04-15 d21a2d9757a8d57f0fa1d0097709c764924ff08e

 fanli/src/main/java/com/yeshi/fanli/entity/push/PushGoodsGroup.java

@@ -3,7 +3,7 @@
import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



import com.yeshi.fanli.goods.CommonGoods;

import com.yeshi.fanli.entity.goods.CommonGoods;



@Table("yeshi_ec_push_goods_group")

public class PushGoodsGroup {