wyh
/
gan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.mowei.com.cn/wyh/gan into main

main
linhw 2024-04-29 16:29:06 +08:00
parent f287384f1c a9ce44ba60
commit e43e08b1ca
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppUserDynamicController.java
View File

@ -43,7 +43,7 @@ public class AppUserDynamicController extends BaseController
/** /**
* 查询App用户动态列表 * 查询App用户动态列表
*/ */
@RequiresPermissions("app:dynamic:list") // @RequiresPermissions("app:dynamic:list")
@GetMapping("/list") @GetMapping("/list")
@ApiOperation(value = "app用户动态列表", notes = "app用户动态列表", httpMethod = "GET") @ApiOperation(value = "app用户动态列表", notes = "app用户动态列表", httpMethod = "GET")
public TableDataInfo list(AppUserDynamic appUserDynamic) public TableDataInfo list(AppUserDynamic appUserDynamic)
@ -53,7 +53,7 @@ public class AppUserDynamicController extends BaseController
return getDataTable(list); return getDataTable(list);
} }
@RequiresPermissions("app:dynamic:list") // @RequiresPermissions("app:dynamic:list")
@GetMapping("/pageList") @GetMapping("/pageList")
@ApiOperation(value = "分页app用户动态列表", notes = "分页app用户动态列表", httpMethod = "GET") @ApiOperation(value = "分页app用户动态列表", notes = "分页app用户动态列表", httpMethod = "GET")
public TableDataInfo pageList(AppUserDynamic appUserDynamic) { public TableDataInfo pageList(AppUserDynamic appUserDynamic) {

2
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java
View File

@ -55,7 +55,7 @@ public class AppUserDynamic extends BaseEntity
private String username; private String username;
@Excel(name = "是否会员") @Excel(name = "是否会员")
private Long isMember; private int isMember;
public void setIsTop(Long isTop) public void setIsTop(Long isTop)
{ {

12
gan-ui/src/views/app/register/index.vue
View File

@ -174,12 +174,12 @@
@click="handleReject(scope.row)" @click="handleReject(scope.row)"
>驳回 >驳回
</el-button> </el-button>
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="error" <!-- type="error"-->
icon="el-icon-finished" <!-- icon="el-icon-finished"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
>删除</el-button> <!-- >删除</el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>