From 1acd2078398b7cd3141cea307f375165d39179e3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 24 二月 2025 16:53:14 +0800
Subject: [PATCH] #优化 1. 数据库关键字暂用修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java | 6 +++---
rsf-server/src/main/resources/application.yml | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 2 --
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
index 8f63e5b..24dbe2a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
@@ -56,9 +56,7 @@
@PostMapping("/loc/save")
public R save(@RequestBody Loc loc) {
loc.setCreateBy(getLoginUserId());
- loc.setCreateTime(new Date());
loc.setUpdateBy(getLoginUserId());
- loc.setUpdateTime(new Date());
if (!locService.save(loc)) {
return R.error("Save Fail");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
index 9253371..017072c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
@@ -92,7 +92,7 @@
* 鎺�
*/
@ApiModelProperty(value= "鎺�")
- private Integer row;
+ private Integer lrow;
/**
* 鍒�
@@ -189,7 +189,7 @@
public Loc() {}
- public Loc(Long areaId,String code,String type,String name,Short flagLogic,String fucAtrrs,String barcode,String unit,String size,Integer row,Integer col,Integer lev,Integer channel,Integer maxParts,Integer maxPack,Short flagLabelMange,String locAttrs,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Loc(Long areaId,String code,String type,String name,Short flagLogic,String fucAtrrs,String barcode,String unit,String size,Integer lrow,Integer col,Integer lev,Integer channel,Integer maxParts,Integer maxPack,Short flagLabelMange,String locAttrs,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.areaId = areaId;
this.code = code;
this.type = type;
@@ -199,7 +199,7 @@
this.barcode = barcode;
this.unit = unit;
this.size = size;
- this.row = row;
+ this.lrow = lrow;
this.col = col;
this.lev = lev;
this.channel = channel;
diff --git a/rsf-server/src/main/resources/application.yml b/rsf-server/src/main/resources/application.yml
index d56421e..f186121 100644
--- a/rsf-server/src/main/resources/application.yml
+++ b/rsf-server/src/main/resources/application.yml
@@ -23,7 +23,7 @@
# global-config:
# field-strategy: 0
configuration:
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
cache-enabled: true
global-config:
--
Gitblit v1.9.1