From 717f2dc779e7404022dd45e9e92819c021f3735f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 11 十一月 2025 18:13:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java | 6 +++++-
ruoyi-applet/src/main/resources/application-test.yml | 8 ++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java
index 2c294ce..01629a5 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java
@@ -64,6 +64,7 @@
));
}
+
@ApiOperation(value = "办事指南--流程指引文件", response = TServiceGuideFile.class)
@PostMapping("/getServiceGuideFile")
public R<Page<TServiceGuideFile>> getServiceGuideFile(@RequestBody BasePage basePage) {
@@ -79,8 +80,8 @@
Page<TConvenientInformation> page = new Page<>(query.getPageNum(), query.getPageSize());
Page<TConvenientInformation> tConvenientInformationPage = tConvenientInformationService.page(page, new LambdaQueryWrapper<TConvenientInformation>().like(Objects.nonNull(query.getName()), TConvenientInformation::getConvenientName, query.getName()).orderByDesc(BaseModel::getCreateTime));
return R.ok(tConvenientInformationPage);
-
}
+
@ApiOperation(value = "便民信息--便民信息详情", response = TConvenientInformation.class)
@GetMapping("/getConvenientInformationDetail/{id}")
@@ -158,6 +159,7 @@
return R.ok(tCommunityActivity);
}
+
@ApiOperation(value = "社区活动--报名", response = TCommunityActivity.class)
@PostMapping("/addCommunityActivityRegistration")
public R<?> addCommunityActivityRegistration(@RequestBody TCommunityActivityRegistration dto) {
@@ -223,6 +225,7 @@
return R.ok(tDeliberationVotePage);
}
+
@ApiOperation(value = "议事投票--投票")
@PostMapping("/addDeliberationVoteOption")
public R<?> addDeliberationVoteOption(@RequestBody TDeliberationVoteOption dto) {
@@ -266,4 +269,5 @@
return R.ok();
}
+
}
diff --git a/ruoyi-applet/src/main/resources/application-test.yml b/ruoyi-applet/src/main/resources/application-test.yml
index 4fcc7b6..71c123c 100644
--- a/ruoyi-applet/src/main/resources/application-test.yml
+++ b/ruoyi-applet/src/main/resources/application-test.yml
@@ -17,7 +17,7 @@
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
- port: 9099
+ port: 9100
servlet:
# 应用的访问路径
context-path: /
@@ -193,12 +193,12 @@
allowExt: .jpg|.png|.gif|.jpeg|.doc|.docx|.apk|.MP4|.mp4|.pdf|.PDF|.xls|.xlsx|.rar|.zip|.rar|.m4a
wx:
conf:
- appId:
- secretId:
+ appId: wx618aa69186bf2ed6
+ secretId: d4af107e0b11236c1db24c1453f28bb3
payment:
wx:
# 微信appid
- appId:
+ appId: wx618aa69186bf2ed6
# 微信商户号
mchId:
# 秘钥
--
Gitblit v1.7.1