合并边民信息

app.pid

@@ -0,0 +1 @@
+24208

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeople.java

@@ -234,15 +234,6 @@ public class TbPeople extends Model<TbPeople> implements Serializable {
 	private Integer deleteStatus;
 
 
-	/**
-	 * 互市区域ID
-	 */
-	private Long tradeAreaId;
-
-	/**
-	 * 互市区名称
-	 */
-	private String tradeAreaName;
 
 
 	

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleController.java

@@ -214,7 +214,7 @@ public class TbPeopleController {
     }
 
     @RequestMapping("getPeopleForGroup")
-    @SaCheckPermission(TbPeople.TABLE_NAME)
+    @SaCheckPermission(TbPeople.PERMISSION_CODE)
     public AjaxJson getPeopleForGroup(@RequestParam Long tradeAreaId) {
         return AjaxJson.getSuccessData(tbPeopleService.getPeopleForGroup(tradeAreaId,1));
     }