Merge remote-tracking branch 'origin/point_dev' into point_dev

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/AreaController.java

@@ -97,6 +97,11 @@ public class AreaController {
         return R.ok(this.areaService.removeByIds(idList));
     }
 
+    /**
+     * 根据城市名称查询编码
+     * @param name
+     * @return R
+     */
     @GetMapping("/code")
     @ApiOperation("name获取code")
     public R getCodeByName(@RequestParam String name) {

nightFragrance-massage/src/main/java/com/ylx/massage/domain/Area.java

@@ -26,9 +26,13 @@ public class Area extends Model<Area> {
     //编码
     @ApiModelProperty("编码")
     private String code;
-    //名称
+
+    /**
+     * 名称
+     */
     @ApiModelProperty("名称")
     private String name;
+
     //父级编码，0为顶级
     @ApiModelProperty("父级编码，0为顶级")
     private String parentCode;