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

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusProject.java

@@ -156,10 +156,6 @@ public class BusProject extends BaseEntity {
     @TableLogic
     private Long isDelete;
 
-    /**
-     * go项目id
-     */
-    private Long goId;
 
     /**
      * 省份

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java

@@ -196,10 +196,6 @@ public class BusProjectVo implements Serializable {
      */
     private List<Punchrange> punchrangeList;
 
-    /**
-     * go项目id
-     */
-    private Long goId;
 
     /**
      * 省份

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/userprojectrelevancy/BusLoginUserProjectRelevancyVo.java

@@ -44,9 +44,4 @@ public class BusLoginUserProjectRelevancyVo implements Serializable {
      * 用户类型(0系统管理员 1普通人员 2项目管理员)
      */
     private String userType;
-
-    /**
-     * go项目id
-     */
-    private Long goId;
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusUserProjectRelevancyServiceImpl.java

@@ -301,7 +301,7 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl<BusUserProje
             return new ArrayList<>();
         }
         Map<Long, List<BusProject>> projectMap = projectService.lambdaQuery()
-            .select(BusProject::getId, BusProject::getPId, BusProject::getProjectName, BusProject::getShortName, BusProject::getGoId)
+            .select(BusProject::getId, BusProject::getPId, BusProject::getProjectName, BusProject::getShortName)
             .in(BusProject::getId, projectIdList)
             .eq(BusProject::getPId, BusProjectConstant.PARENT_ID)
             .list()
@@ -321,7 +321,6 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl<BusUserProje
                     loginUserProjectRelevancy.setProjectId(projectId);
                     loginUserProjectRelevancy.setProjectName(project.getProjectName());
                     loginUserProjectRelevancy.setShortName(project.getShortName());
-                    loginUserProjectRelevancy.setGoId(project.getGoId());
                     return loginUserProjectRelevancy;
                 }
                 return null;