:Merge branch 'zhangrenyuan/feature-20250714163943-金币前端二期' into milestone-20250711-金币前端二期

.env.development

@@ -1,4 +1,4 @@
-VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
-#  VITE_API_BASE='http://192.168.9.28:8081/'
+# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
+ VITE_API_BASE='http://192.168.9.28:8081/'
 VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
 

src/views/permissions/permission.vue

@@ -81,7 +81,6 @@ const getAdminData = async function () {
     console.log('请求失败', error)
   }
 }
-<<<<<<< HEAD
 const viewRole =ref([])
 const getRolePermission = async function(){
     const result = await request({
@@ -93,10 +92,8 @@ const getRolePermission = async function(){
     viewRole.value = collectIds(result.data)
     console.log('result111',viewRole.value);
 }
-=======
 
 
->>>>>>> zhangrenyuan/feature-20250714163943-金币前端二期
 // 编辑用户权限对象
 const permissionEditObj = ref({
   checkedKeys: [],