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

main
linhw 2024-04-29 16:29:06 +08:00
commit e43e08b1ca
3 changed files with 9 additions and 9 deletions

View File

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

View File

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

View File

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