Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/NonStandardApplyQuery.java

@@ -39,9 +39,6 @@ public class NonStandardApplyQuery {
 	@ApiModelProperty(name = "userId", value = "用户id")
 	private Integer userId;
 
-	@ApiModelProperty(value = "按钮类型 1：提交")
-	private Integer menuId;
-
 	@ApiModelProperty(value = "姓名")
 	private String name;
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApplyServiceImpl.java

@@ -82,14 +82,6 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
 		NonStandardApply nsa = new NonStandardApply();
 		BeanUtils.copyProperties(query, nsa);
 		nsa.setId(query.getId());
-		if(query.getMenuId() == null){
-			return BaseResponse.errorMsg("按钮参数不能为空");
-		}
-		if(query.getMenuId()== 1){   //通过
-			nsa.setStatus(1);
-		}else{
-			return BaseResponse.errorMsg("按钮参数错误");
-		}
 		nonStandardApplyMapper.updateById(nsa);
 		return BaseResponse.okData(nsa);
 	}