1.修改字段

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java

@@ -94,6 +94,7 @@ public class BasicdataTeamGroupController extends BladeController {
 		}
 		IPage<BasicdataTeamGroupEntity> pages = basicdataTeamGroupService.page(Condition.getPage(query),queryWrapper);
 		return R.data(pages);
+
 	}
 
 	/**

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.xml

@@ -29,9 +29,9 @@
         select * from logpm_basicdata_team_group where is_deleted = 0
     </select>
     <select id="listTeam" resultType="com.logpm.basicdata.vo.BasicdataTeamGroupVO">
-        select btg.id,btg.belong_to ,btg.group_type ,btg.group_name ,lww.name
+        select btg.id,btg.warehouse_id ,btg.group_type ,btg.group_name ,lww.name
         from logpm_basicdata_team_group btg
-                 LEFT JOIN logpm_warehouse_warehouse lww on btg.belong_to = lww.id
+                 LEFT JOIN logpm_warehouse_warehouse lww on btg.warehouse_id = lww.id
         <where>
             lww.department =#{param.department}
         </where>