Merge branch 'zrq' into dev

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/AppmanageEntity/AppEnvInfo.java

@@ -15,7 +15,7 @@ import lombok.Data;
 public class AppEnvInfo {
     @TableId
     private String id;
-    private String appId;
+    private String appid;
     private String leadingIp;
     private String backendIp;
     private String backupFrequency;

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/AppmanageServiceImpl.java

@@ -171,7 +171,7 @@ public class AppmanageServiceImpl implements AppmanageService {
         if (!appInfo.getAppEnvInfoDTO().isEmpty()){
             System.out.println("环境信息不为空");
             for (AppEnvInfo appEnvInfo : appInfo.getAppEnvInfoDTO()){
-                appEnvInfo.setAppId(appid);
+                appEnvInfo.setAppid(appid);
                 envInfoMapper.insert(appEnvInfo);
             }
         }
@@ -252,7 +252,7 @@ public class AppmanageServiceImpl implements AppmanageService {
             for (AppEnvInfo appEnvInfo : envInfo) {
                 // 如果没有id信息，则为新增的数据
                 if (appEnvInfo.getId()==null){
-                    appEnvInfo.setAppId(appid);
+                    appEnvInfo.setAppid(appid);
                     envInfoMapper.insert(appEnvInfo);
                 }else { // 有id信息则为在原有数据基础上需修改的数据
                     envInfoMapper.updateById(appEnvInfo);
@@ -392,7 +392,7 @@ public class AppmanageServiceImpl implements AppmanageService {
     @Override
     public List<AppEnvInfo> queryEnvInfoByAppId(String appid) {
         List<AppEnvInfo> envInfos = envInfoMapper.
-                selectList(new QueryWrapper<AppEnvInfo>().eq("app_id", appid));
+                selectList(new QueryWrapper<AppEnvInfo>().eq("appid", appid));
         return envInfos;
     }
 

jeecgboot-vue3/src/views/appmanage/AppInfoList.vue

@@ -703,7 +703,8 @@ export default defineComponent({
 }
 
 .detail{
-  height: 70vh;
+  height: auto;
+  max-height: 70vh;
   overflow-y: auto;
 }
 </style>

jeecgboot-vue3/src/views/appmanage/addForm/Step4.vue

@@ -119,6 +119,8 @@
             </a-table>
           </div>
 
+          <div style="height: 1vh; width: 100%;"/>
+
           <!-- 移除用户列表 -->
           <div class="table_bottom">
             <a-table :columns="removeUsercolumns" :data-source="removeUserData"
@@ -130,7 +132,7 @@
               </template>
               <template #bodyCell="{ column, record }">
                 <template v-if="column.dataIndex === 'action'">
-                  <a-button type="link" @click="recoverRemoveOneUserInfo(record.key)">移 出</a-button>
+                  <a-button type="link" @click="recoverRemoveOneUserInfo(record.key)">恢 复</a-button>
                 </template>
               </template>
             </a-table>
@@ -795,7 +797,7 @@ export default defineComponent({
 
 .rightuserTableClass{
   height: 29%;
-  border-left: 1px solid #d9d9d9;
+  border: 1px solid #d9d9d9;
 }
 /* 如果需要，可以在这里添加额外的样式 */