Merge branch 'wdz' into 'develop'

早上起来拉一下develop，debug一下

See merge request 8timerv2/8timerapiv200!43

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -1544,10 +1544,10 @@ public class YgglController {
 	 * @param
 	 * @return
 	 */
-	@PostMapping(value = "/jgshow")
+	@PostMapping(value = "/jgshow/{jgid}")
 	@ApiOperation(value = "展示籍贯所有省市区威力增强版", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperationSupport(order = 388)
-	public Result<Map<String, String>> selectjgs1(@CurrentUser UserBean userBean, @RequestBody String jgid) {
+	public Result<Map<String, String>> selectjgs1(@CurrentUser UserBean userBean, @PathVariable String jgid) {
 		// public Result<List<YgjgDto>> selectjgs1(@CurrentUser UserBean userBean,
 		// @RequestBody YgjgDto ygjgDto) {
 		Integer upId = Integer.valueOf(jgid);