From dc6a7afceed5911554e0f801ff63b9f4eebbbc83 Mon Sep 17 00:00:00 2001 From: huliyong <2783385703@qq.com> Date: Sat, 20 Sep 2025 13:47:39 +0800 Subject: [PATCH] 1 --- .../modules/applet/controller/AppletApiPromotionController.java | 3 ++- jeecgboot-vue3/src/views/applet/withdrawal/AppletWithdrawal.data.ts | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiPromotionController.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiPromotionController.java index 3bd0b14..4a3728f 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiPromotionController.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiPromotionController.java @@ -15,6 +15,7 @@ import org.jeecg.modules.demo.appletWater.entity.AppletWater; import org.jeecg.modules.demo.appletWithdrawal.entity.AppletWithdrawal; import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -29,7 +30,7 @@ public class AppletApiPromotionController { private AppletApiWaterService appletApiWaterService; @Operation(summary = "获取推广二维码", description = "获取推广二维码") - @GetMapping(value = "/qrCode") + @GetMapping(value = "/qrCode", produces = MediaType.IMAGE_PNG_VALUE) public byte[] getInviteCode() { return appletApiWaterService.getInviteCode(); } diff --git a/jeecgboot-vue3/src/views/applet/withdrawal/AppletWithdrawal.data.ts b/jeecgboot-vue3/src/views/applet/withdrawal/AppletWithdrawal.data.ts index 821cf2b..267a151 100644 --- a/jeecgboot-vue3/src/views/applet/withdrawal/AppletWithdrawal.data.ts +++ b/jeecgboot-vue3/src/views/applet/withdrawal/AppletWithdrawal.data.ts @@ -6,7 +6,7 @@ import { getWeekMonthQuarterYear } from '/@/utils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '用户id', + title: '用户', align:"center", dataIndex: 'userId_dictText' }, @@ -55,7 +55,7 @@ export const searchFormSchema: FormSchema[] = [ //表单数据 export const formSchema: FormSchema[] = [ { - label: '用户id', + label: '用户', field: 'userId', component: 'JSearchSelect', componentProps:{ @@ -124,7 +124,7 @@ export const formSchema: FormSchema[] = [ // 高级查询数据 export const superQuerySchema = { - userId: {title: '用户id',order: 0,view: 'sel_search', type: 'string',dictTable: "applet_user", dictCode: 'id', dictText: 'name',}, + userId: {title: '用户',order: 0,view: 'sel_search', type: 'string',dictTable: "applet_user", dictCode: 'id', dictText: 'name',}, name: {title: '申请人',order: 1,view: 'text', type: 'string',}, money: {title: '提现金额',order: 2,view: 'number', type: 'number',}, method: {title: '提现方式',order: 3,view: 'list', type: 'string',dictCode: 'applett_translate_type',},