From 8849a8a7032079df128f0c530fd4368cfbc75d81 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 12 Sep 2025 15:10:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into xin
---
oying-system/src/main/java/com/oying/modules/message/rest/MesShopReplyController.java | 18 +++++++++---------
oying-system/src/main/java/com/oying/modules/message/rest/MesMsgRecordController.java | 2 +-
oying-system/src/main/java/com/oying/modules/message/rest/MesOrderEvaluationController.java | 2 +-
oying-system/src/main/java/com/oying/modules/message/rest/MesOrderItemEvaluationController.java | 2 +-
.idea/compiler.xml | 10 +++++-----
oying-system/src/main/java/com/oying/modules/message/rest/MesAdvertisementController.java | 2 +-
oying-system/src/main/java/com/oying/modules/message/rest/MesMsgTemplateController.java | 12 ++++++------
oying-system/src/main/java/com/oying/modules/message/rest/MesCustomerCommentMsgController.java | 2 +-
oying-system/src/main/java/com/oying/modules/message/rest/MesRiderEvaluationController.java | 2 +-
9 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b697d3f..8f29a85 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,11 +17,11 @@
</component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
- <module name="oying-common" options="" />
- <module name="oying-generator" options="" />
- <module name="oying-logging" options="" />
- <module name="oying-system" options="" />
- <module name="oying-tools" options="" />
+ <module name="oying-common" options="-parameters" />
+ <module name="oying-generator" options="-parameters" />
+ <module name="oying-logging" options="-parameters" />
+ <module name="oying-system" options="-parameters" />
+ <module name="oying-tools" options="-parameters" />
</option>
</component>
</project>
\ No newline at end of file
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MesAdvertisementController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MesAdvertisementController.java
index ca9015d..9ca4a34 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MesAdvertisementController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MesAdvertisementController.java
@@ -23,7 +23,7 @@
**/
@RestController
@RequiredArgsConstructor
-@Api(tags = "消息")
+@Api(tags = "消息中心：广告")
@RequestMapping("/api/mesAdvertisement")
public class MesAdvertisementController {
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MesCustomerCommentMsgController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MesCustomerCommentMsgController.java
index 89cbb50..9d0a1e9 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MesCustomerCommentMsgController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MesCustomerCommentMsgController.java
@@ -19,7 +19,7 @@
**/
@RestController
@RequiredArgsConstructor
-@Api(tags = "消息中心2.0")
+@Api(tags = "消息中心：留言")
@RequestMapping("/api/mesCustomerCommentMsg")
public class MesCustomerCommentMsgController {
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MesMsgRecordController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MesMsgRecordController.java
index 95821ef..889c0d6 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MesMsgRecordController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MesMsgRecordController.java
@@ -27,7 +27,7 @@
@Slf4j
@RestController
@RequiredArgsConstructor
-@Api(tags = "消息中心2.0")
+@Api(tags = "消息中心：消息")
@RequestMapping("/api/mesMsgRecord")
public class MesMsgRecordController {
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MesMsgTemplateController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MesMsgTemplateController.java
index ba80631..c29ebeb 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MesMsgTemplateController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MesMsgTemplateController.java
@@ -23,13 +23,13 @@
**/
@RestController
@RequiredArgsConstructor
-@Api(tags = "消息")
+//@Api(tags = "消息")
@RequestMapping("/api/mesMsgTemplate")
public class MesMsgTemplateController {
private final MesMsgTemplateService mesMsgTemplateService;
- @ApiOperation("导出数据")
+// @ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('mesMsgTemplate:list')")
public void exportMesMsgTemplate(HttpServletResponse response, MesMsgTemplateQueryCriteria criteria) throws IOException {
@@ -37,7 +37,7 @@
}
@GetMapping
- @ApiOperation("查询消息")
+// @ApiOperation("查询消息")
@PreAuthorize("@el.check('mesMsgTemplate:list')")
public ResponseEntity<PageResult<MesMsgTemplate>> queryMesMsgTemplate(MesMsgTemplateQueryCriteria criteria){
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
@@ -46,7 +46,7 @@
@PostMapping
@Log("新增消息")
- @ApiOperation("新增消息")
+// @ApiOperation("新增消息")
@PreAuthorize("@el.check('mesMsgTemplate:add')")
public ResponseEntity<Object> createMesMsgTemplate(@Validated @RequestBody MesMsgTemplate resources){
mesMsgTemplateService.create(resources);
@@ -55,7 +55,7 @@
@PutMapping
@Log("修改消息")
- @ApiOperation("修改消息")
+// @ApiOperation("修改消息")
@PreAuthorize("@el.check('mesMsgTemplate:edit')")
public ResponseEntity<Object> updateMesMsgTemplate(@Validated @RequestBody MesMsgTemplate resources){
mesMsgTemplateService.update(resources);
@@ -64,7 +64,7 @@
@DeleteMapping
@Log("删除消息")
- @ApiOperation("删除消息")
+// @ApiOperation("删除消息")
@PreAuthorize("@el.check('mesMsgTemplate:del')")
public ResponseEntity<Object> deleteMesMsgTemplate(@ApiParam(value = "传ID数组[]") @RequestBody List<Integer> ids) {
mesMsgTemplateService.deleteAll(ids);
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderEvaluationController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderEvaluationController.java
index e3414d3..b64c131 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderEvaluationController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderEvaluationController.java
@@ -17,7 +17,7 @@
**/
@RestController
@RequiredArgsConstructor
-@Api(tags = "消息中心2.0")
+@Api(tags = "消息中心：店铺")
@RequestMapping("/api/mesOrderEvaluation")
public class MesOrderEvaluationController {
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderItemEvaluationController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderItemEvaluationController.java
index b6f56bb..8367158 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderItemEvaluationController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MesOrderItemEvaluationController.java
@@ -17,7 +17,7 @@
**/
@RestController
@RequiredArgsConstructor
-@Api(tags = "消息中心2.0")
+@Api(tags = "消息中心：订单")
@RequestMapping("/api/mesOrderItemEvaluation")
public class MesOrderItemEvaluationController {
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MesRiderEvaluationController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MesRiderEvaluationController.java
index f47126c..191a83f 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MesRiderEvaluationController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MesRiderEvaluationController.java
@@ -17,7 +17,7 @@
**/
@RestController
@RequiredArgsConstructor
-@Api(tags = "消息中心2.0")
+@Api(tags = "消息中心：骑手")
@RequestMapping("/api/mesRiderEvaluation")
public class MesRiderEvaluationController {
diff --git a/oying-system/src/main/java/com/oying/modules/message/rest/MesShopReplyController.java b/oying-system/src/main/java/com/oying/modules/message/rest/MesShopReplyController.java
index 8cc69a0..a31e37f 100644
--- a/oying-system/src/main/java/com/oying/modules/message/rest/MesShopReplyController.java
+++ b/oying-system/src/main/java/com/oying/modules/message/rest/MesShopReplyController.java
@@ -23,13 +23,13 @@
**/
@RestController
@RequiredArgsConstructor
-@Api(tags = "消息")
+//@Api(tags = "消息")
@RequestMapping("/api/mesShopReply")
public class MesShopReplyController {
private final MesShopReplyService mesShopReplyService;
- @ApiOperation("导出数据")
+// @ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check('mesShopReply:list')")
public void exportMesShopReply(HttpServletResponse response, MesShopReplyQueryCriteria criteria) throws IOException {
@@ -37,7 +37,7 @@
}
@GetMapping
- @ApiOperation("查询消息")
+// @ApiOperation("查询消息")
@PreAuthorize("@el.check('mesShopReply:list')")
public ResponseEntity<PageResult<MesShopReply>> queryMesShopReply(MesShopReplyQueryCriteria criteria){
Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
@@ -45,8 +45,8 @@
}
@PostMapping
- @Log("新增消息")
- @ApiOperation("新增消息")
+// @Log("新增消息")
+// @ApiOperation("新增消息")
@PreAuthorize("@el.check('mesShopReply:add')")
public ResponseEntity<Object> createMesShopReply(@Validated @RequestBody MesShopReply resources){
mesShopReplyService.create(resources);
@@ -54,8 +54,8 @@
}
@PutMapping
- @Log("修改消息")
- @ApiOperation("修改消息")
+// @Log("修改消息")
+// @ApiOperation("修改消息")
@PreAuthorize("@el.check('mesShopReply:edit')")
public ResponseEntity<Object> updateMesShopReply(@Validated @RequestBody MesShopReply resources){
mesShopReplyService.update(resources);
@@ -63,8 +63,8 @@
}
@DeleteMapping
- @Log("删除消息")
- @ApiOperation("删除消息")
+// @Log("删除消息")
+// @ApiOperation("删除消息")
@PreAuthorize("@el.check('mesShopReply:del')")
public ResponseEntity<Object> deleteMesShopReply(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
mesShopReplyService.deleteAll(ids);
--
Gitblit v1.9.3