From e7200a1bfc5abf3dac04955dfa533476f535a5ea Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 14 七月 2025 14:18:08 +0800
Subject: [PATCH] zjh20250714
---
ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallCategoryController.java | 12 ++++++------
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java | 11 +++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallKeywordController.java | 12 ++++++------
3 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallCategoryController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallCategoryController.java
index 2028eba..7fc1662 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallCategoryController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallCategoryController.java
@@ -40,7 +40,7 @@
/**
* 鏌ヨ绫荤洰鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('mall:category:list')")
+// @PreAuthorize("@ss.hasPermi('mall:category:list')")
@GetMapping("/list")
@ApiOperation(value = "鏌ヨ绫荤洰鍒楄〃")
public TableDataInfo list(MallCategory mallCategory) {
@@ -52,7 +52,7 @@
/**
* 瀵煎嚭绫荤洰鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('mall:category:export')")
+// @PreAuthorize("@ss.hasPermi('mall:category:export')")
@Log(title = "绫荤洰", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, MallCategory mallCategory) {
@@ -65,7 +65,7 @@
* 鑾峰彇绫荤洰璇︾粏淇℃伅
*/
@ApiOperation(value = "鑾峰彇绫荤洰璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('mall:category:query')")
+// @PreAuthorize("@ss.hasPermi('mall:category:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(mallCategoryService.selectMallCategoryById(id));
@@ -75,7 +75,7 @@
* 鏂板绫荤洰
*/
@ApiOperation(value = "鏂板绫荤洰")
- @PreAuthorize("@ss.hasPermi('mall:category:add')")
+// @PreAuthorize("@ss.hasPermi('mall:category:add')")
@Log(title = "绫荤洰", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody MallCategory mallCategory) {
@@ -86,7 +86,7 @@
* 淇敼绫荤洰
*/
@ApiOperation(value = "淇敼绫荤洰")
- @PreAuthorize("@ss.hasPermi('mall:category:edit')")
+// @PreAuthorize("@ss.hasPermi('mall:category:edit')")
@Log(title = "绫荤洰", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody MallCategory mallCategory) {
@@ -97,7 +97,7 @@
* 鍒犻櫎绫荤洰
*/
@ApiOperation(value = "鍒犻櫎绫荤洰")
- @PreAuthorize("@ss.hasPermi('mall:category:remove')")
+// @PreAuthorize("@ss.hasPermi('mall:category:remove')")
@Log(title = "绫荤洰", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallKeywordController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallKeywordController.java
index df62e96..91354db 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallKeywordController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/mall/MallKeywordController.java
@@ -37,7 +37,7 @@
/**
* 鏌ヨ鍏抽敭瀛楀垪琛�
*/
- @PreAuthorize("@ss.hasPermi('mall:keyword:list')")
+// @PreAuthorize("@ss.hasPermi('mall:keyword:list')")
@GetMapping("/list")
public TableDataInfo list(MallKeyword mallKeyword) {
startPage();
@@ -48,7 +48,7 @@
/**
* 瀵煎嚭鍏抽敭瀛楀垪琛�
*/
- @PreAuthorize("@ss.hasPermi('mall:keyword:export')")
+// @PreAuthorize("@ss.hasPermi('mall:keyword:export')")
@Log(title = "鍏抽敭瀛�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, MallKeyword mallKeyword) {
@@ -60,7 +60,7 @@
/**
* 鑾峰彇鍏抽敭瀛楄缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('mall:keyword:query')")
+// @PreAuthorize("@ss.hasPermi('mall:keyword:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(mallKeywordService.selectMallKeywordById(id));
@@ -69,7 +69,7 @@
/**
* 鏂板鍏抽敭瀛�
*/
- @PreAuthorize("@ss.hasPermi('mall:keyword:add')")
+// @PreAuthorize("@ss.hasPermi('mall:keyword:add')")
@Log(title = "鍏抽敭瀛�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody MallKeyword mallKeyword) {
@@ -79,7 +79,7 @@
/**
* 淇敼鍏抽敭瀛�
*/
- @PreAuthorize("@ss.hasPermi('mall:keyword:edit')")
+// @PreAuthorize("@ss.hasPermi('mall:keyword:edit')")
@Log(title = "鍏抽敭瀛�", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody MallKeyword mallKeyword) {
@@ -89,7 +89,7 @@
/**
* 鍒犻櫎鍏抽敭瀛�
*/
- @PreAuthorize("@ss.hasPermi('mall:keyword:remove')")
+// @PreAuthorize("@ss.hasPermi('mall:keyword:remove')")
@Log(title = "鍏抽敭瀛�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
index b9c5257..fa48657 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
@@ -504,6 +504,17 @@
private String zhiyeZysszdw;
+ private String rjJy;
+ private String riJyr;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date rjJysj;
+
+ private String sjJy;
+ private String sjJyr;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date sjJysj;
+
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.8.0