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

admin

2019-09-03 74ee9c42c1d87f3724a21e92871bc8c95c8364c6

 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 {