From bdbcdac0bf39a063570245559e650535f556dd80 Mon Sep 17 00:00:00 2001 From: 13233904609 <13233904609@163.cm> Date: Tue, 23 Jul 2024 18:05:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/distributionlog/DistributionLogController.java | 2 +- .../member/controller/app/user/AppMemberUserController.java | 2 +- yudao-ui-admin-vue3-master/index.html | 4 ++-- .../components/DiyEditor/components/mobile/UserCard/index.vue | 2 +- .../bpmnProcessDesigner/package/designer/ProcessDesigner.vue | 2 +- yudao-ui-admin-vue3-master/src/utils/constants.ts | 2 +- yudao-ui-admin-vue3-master/src/views/Login/SocialLogin.vue | 2 +- .../src/views/Login/components/MobileForm.vue | 2 +- .../src/views/mp/components/wx-material-select/main.vue | 2 +- .../src/views/mp/components/wx-msg/main.vue | 2 +- .../src/views/mp/components/wx-news/main.vue | 2 +- .../src/views/mp/components/wx-reply/main.vue | 2 +- .../src/views/mp/components/wx-video-play/main.vue | 2 +- .../src/views/mp/components/wx-voice-play/main.vue | 2 +- .../src/views/mp/material/components/ImageTable.vue | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionlog/DistributionLogController.java b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionlog/DistributionLogController.java index 28845d3..119a605 100644 --- a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionlog/DistributionLogController.java +++ b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/distributionlog/DistributionLogController.java @@ -84,7 +84,7 @@ public class DistributionLogController { @Operation(summary = "获得分销记录分页") @PreAuthorize("@ss.hasPermission('member:distribution-log:query')") public CommonResult> getDistributionLogPage(@Valid DistributionLogPageReqVO pageReqVO) { - pageReqVO.setGameStatus("0"); +// pageReqVO.setGameStatus("0"); PageResult pageResult = distributionLogService.getDistributionLogPage(pageReqVO); // 拼接结果返回 List users = memberUserService.getUserList( diff --git a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java index b193be4..35688ec 100644 --- a/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java +++ b/ruoyi-vue-pro-master/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java @@ -43,7 +43,7 @@ public class AppMemberUserController { MemberLevelDO level = levelService.getLevel(user.getLevelId()); AppMemberUserInfoRespVO convert = MemberUserConvert.INSTANCE.convert(user, level); convert.setId(getLoginUserId()+""); - convert.setUrlLink(socialClientApi.getWxUrlInfo(UserTypeEnum.MEMBER.getValue()).toString()); +// convert.setUrlLink(socialClientApi.getWxUrlInfo(UserTypeEnum.MEMBER.getValue()).toString()); return success(convert); } diff --git a/yudao-ui-admin-vue3-master/index.html b/yudao-ui-admin-vue3-master/index.html index 8cfcbef..5deaae0 100644 --- a/yudao-ui-admin-vue3-master/index.html +++ b/yudao-ui-admin-vue3-master/index.html @@ -7,11 +7,11 @@ %VITE_APP_TITLE% diff --git a/yudao-ui-admin-vue3-master/src/components/DiyEditor/components/mobile/UserCard/index.vue b/yudao-ui-admin-vue3-master/src/components/DiyEditor/components/mobile/UserCard/index.vue index 14b447c..fb2896d 100644 --- a/yudao-ui-admin-vue3-master/src/components/DiyEditor/components/mobile/UserCard/index.vue +++ b/yudao-ui-admin-vue3-master/src/components/DiyEditor/components/mobile/UserCard/index.vue @@ -5,7 +5,7 @@ - 芋道源码 + 郑大钒水源码 diff --git a/yudao-ui-admin-vue3-master/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue b/yudao-ui-admin-vue3-master/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue index 6cbe11f..4c78ffa 100644 --- a/yudao-ui-admin-vue3-master/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue +++ b/yudao-ui-admin-vue3-master/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue @@ -664,7 +664,7 @@ const previewProcessJson = () => { previewModelVisible.value = true }) } -/* ------------------------------------------------ 芋道源码 methods ------------------------------------------------------ */ +/* ------------------------------------------------ 郑大钒水源码 methods ------------------------------------------------------ */ const processSave = async () => { // console.log(bpmnModeler, 'bpmnModelerbpmnModelerbpmnModelerbpmnModeler') const { err, xml } = await bpmnModeler.saveXML() diff --git a/yudao-ui-admin-vue3-master/src/utils/constants.ts b/yudao-ui-admin-vue3-master/src/utils/constants.ts index cfa785b..cee1744 100644 --- a/yudao-ui-admin-vue3-master/src/utils/constants.ts +++ b/yudao-ui-admin-vue3-master/src/utils/constants.ts @@ -1,5 +1,5 @@ /** - * Created by 芋道源码 + * Created by 郑大钒水源码 * * 枚举类 */ diff --git a/yudao-ui-admin-vue3-master/src/views/Login/SocialLogin.vue b/yudao-ui-admin-vue3-master/src/views/Login/SocialLogin.vue index eff59ba..40246f1 100644 --- a/yudao-ui-admin-vue3-master/src/views/Login/SocialLogin.vue +++ b/yudao-ui-admin-vue3-master/src/views/Login/SocialLogin.vue @@ -196,7 +196,7 @@ const loginData = reactive({ captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE !== 'false', tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false', loginForm: { - tenantName: '芋道源码', + tenantName: '郑大钒水', username: 'admin', password: 'admin123', captchaVerification: '', diff --git a/yudao-ui-admin-vue3-master/src/views/Login/components/MobileForm.vue b/yudao-ui-admin-vue3-master/src/views/Login/components/MobileForm.vue index 7f5d994..74a3f0a 100644 --- a/yudao-ui-admin-vue3-master/src/views/Login/components/MobileForm.vue +++ b/yudao-ui-admin-vue3-master/src/views/Login/components/MobileForm.vue @@ -133,7 +133,7 @@ const loginData = reactive({ }, loginForm: { uuid: '', - tenantName: '芋道源码', + tenantName: '郑大钒水', mobileNumber: '', code: '' } diff --git a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-material-select/main.vue b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-material-select/main.vue index aad25ea..53d021b 100644 --- a/yudao-ui-admin-vue3-master/src/views/mp/components/wx-material-select/main.vue +++ b/yudao-ui-admin-vue3-master/src/views/mp/components/wx-material-select/main.vue @@ -1,7 +1,7 @@