Merge remote-tracking branch 'origin/master'

admin

2019-01-26 b8d98797f162f34ce0e4245b0d879ea0e6a30db0

 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 {