--no commit message

com.zrqx.fg.member/src/main/java/com/zrqx/bg/member/mapper/departmentmember/FgDepartmentMemberMapper.java

@@ -69,7 +69,7 @@ public interface FgDepartmentMemberMapper extends BaseMapper<DepartmentMember>{
 	 * @author zzg
 	 * @date: 2019年4月3日 上午8:33:00
 	 */
-	@Select("select s.id, s.relationId, s.type, s.name, s.sort, s.createTime, ms.name as schoolName "
+	@Select("select s.id, s.relationId, s.type, s.name, s.sort, s.createTime, ms.name as schoolName,s.status "
 			+ " FROM me_department_member s left join me_school ms on s.relationId = ms.id "
 			+ "WHERE  1=1 "
 			+ " and s.id = #{id}")

com.zrqx.publisher/src/main/java/com/zrqx/publisher/controller/supplier/SupplierController.java

@@ -167,10 +167,7 @@ public class SupplierController {
 	@ApiOperation(value = "经销商导入退订订单")
 	@PostMapping(value = SchoolRequestPath.PUBLISHER + MemberRequestPath.IMPORT)
 	public CallBack<String> importSupplierBackOrder(@RequestParam("file") MultipartFile file) throws Exception{
-		CallBack<String> importSupplierBackOrder = schoolSysuserClient.importSupplierBackOrder(file);
-		if(importSupplierBackOrder.hasEntity()){
-			return importSupplierBackOrder;
-		}
+		
 		return null;
 	}