fanli-server.git

main / fanli-server

返利

概况
操作记录
提交次数
目录
文档
派生
对比

blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace

冲突信息

yujian

2019-12-16 6dfb4599cee5c19f4d1c5cc344a4f84de1c1633c

 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java

@@ -20,7 +20,7 @@
import com.yeshi.fanli.entity.push.PushGoods;

import com.yeshi.fanli.entity.push.PushGoodsGroup;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.exception.push.PushGoodsException;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;

			@@ -20,7 +20,7 @@
			import com.yeshi.fanli.entity.push.PushGoods;
			import com.yeshi.fanli.entity.push.PushGoodsGroup;
			import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
			import com.yeshi.fanli.exception.PushException;
			import com.yeshi.fanli.exception.push.PushException;
			import com.yeshi.fanli.exception.push.PushGoodsException;
			import com.yeshi.fanli.service.AdminUserService;
			import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;