Merge remote-tracking branch 'origin/master'

op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java

@@ -104,7 +104,7 @@ public class BaseEquipmentController extends BaseController {
 	/**
 	 * 查询设备类型
 	 */
-	@RequiresPermissions("wms:equipment:getEquipmentTypeList")
+//	@RequiresPermissions("wms:equipment:getEquipmentTypeList")
 	@GetMapping("/getEquipmentTypeList")
 	public TableDataInfo getEquipmentTypeList(BaseEquipment baseEquipment) {
 		List<BaseEquipment> list = baseEquipmentService.getEquipmentTypeList(baseEquipment);

op-modules/op-wms/src/main/java/com/op/wms/controller/BaseTeamUserController.java

@@ -48,7 +48,7 @@ public class BaseTeamUserController extends BaseController {
 	/**
 	 * 查询班组人员列表
 	 */
-	@RequiresPermissions("wms:teamUser:listTeamMembers")
+//	@RequiresPermissions("wms:teamUser:listTeamMembers")
 	@GetMapping("/listTeamMembers")
 	public TableDataInfo listTeamMembers(BaseTeamUser baseTeamUser) {
 		startPage();

op-modules/op-wms/src/main/java/com/op/wms/controller/SysFactoryController.java

@@ -102,10 +102,7 @@ public class SysFactoryController extends BaseController {
 	}
 
 	// 查询工作中心
-	/**
+//	@RequiresPermissions("wms:factory:getWorkCenterList")
-	 * 查询设备管理列表
-	 */
-	@RequiresPermissions("wms:factory:getWorkCenterList")
 	@GetMapping("/getWorkCenterList")
 	public TableDataInfo getWorkCenterList(SysFactory sysFactory) {
 		startPage();