Merge branch 'dev' into 'mp-server-test'

商品修改

See merge request quanshu/mp-server!178

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsMgrController.java

@@ -171,7 +171,7 @@ public class GoodsMgrController extends BaseApiController {
 	@ApiOperation(value = "编辑商品信息", notes = "后台商品管理修改商品信息")
 	@PostMapping("/update")
 	public AjaxResult goodsUpdate(@Validated @RequestBody GoodsParam goodsParam) {
-		if (null == goodsParam || null != goodsParam.getGoodsId() || 0 == goodsParam.getGoodsId()) {
+		if (null == goodsParam || null == goodsParam.getGoodsId() || 0 == goodsParam.getGoodsId()) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 		Goods oldGoods = goodsService.getById(goodsParam.getGoodsId());