|
@@ -60,9 +60,8 @@ public class BrandController extends BaseController {
|
60
|
60
|
* @return
|
61
|
61
|
*/
|
62
|
62
|
@ApiOperation(value = "admin-品牌开发商表列表", notes = "admin-品牌开发商表列表")
|
63
|
|
- @RequestMapping(value="/{plat}/brand",method= RequestMethod.GET)
|
64
|
|
- public ResponseBean brandList(@PathVariable String plat,
|
65
|
|
- @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
|
|
63
|
+ @RequestMapping(value="/admin/brand",method= RequestMethod.GET)
|
|
64
|
+ public ResponseBean brandList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
|
66
|
65
|
@RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
|
67
|
66
|
@RequestParam(value ="brandName",required = false) String brandName,
|
68
|
67
|
@RequestHeader("authorization") String token,HttpServletRequest request){
|
|
@@ -85,6 +84,18 @@ public class BrandController extends BaseController {
|
85
|
84
|
return responseBean;
|
86
|
85
|
}
|
87
|
86
|
|
|
87
|
+ /**
|
|
88
|
+ *
|
|
89
|
+ * @return
|
|
90
|
+ */
|
|
91
|
+ @ApiOperation(value = "wx-品牌开发商表列表", notes = "wx-品牌开发商表列表")
|
|
92
|
+ @RequestMapping(value="/wx/brand",method= RequestMethod.GET)
|
|
93
|
+ public ResponseBean wxBrandList(@RequestParam(value ="brandName",required = false) String brandName,
|
|
94
|
+ @RequestParam(value ="cityId",required = false) Integer cityId,
|
|
95
|
+ @RequestHeader("authorization") String token,HttpServletRequest request){
|
|
96
|
+ return iBrandService.getWxBrandList(cityId,brandName,getOrgId(request));
|
|
97
|
+ }
|
|
98
|
+
|
88
|
99
|
/**
|
89
|
100
|
* 保存对象
|
90
|
101
|
* @param brandDTO 实体对象
|