Commit Graph

57 Commits

Author SHA1 Message Date
2a884cf21b Merge branch 'master' of http://121.40.234.130:8899/root/nladmin
# Conflicts:
#	nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java
2022-10-11 18:31:09 +08:00
ldj_willow
a683ec765a 代码更新
Signed-off-by: ldj_willow <ldj_willow@163.com>
2022-10-11 15:38:41 +08:00
lyd
b44858bf9b loki修改 2022-10-11 15:36:35 +08:00
ldj_willow
28abb527d9 系统参数代码更新
Signed-off-by: ldj_willow <ldj_willow@163.com>
2022-10-11 14:11:20 +08:00
ldj_willow
0ddf7cfa48 系统参数代码更新 2022-10-11 14:11:01 +08:00
ldj_willow
2914a93d0e 日志更新 2022-10-11 14:04:29 +08:00
lyd
c3048a5f01 loki注解和切面写入日志、日志管理定时器销毁问题 2022-10-11 11:09:52 +08:00
lyd
87a0099839 生箔区域去掉点位状态 2022-10-10 15:45:43 +08:00
lyd
f6de45d426 生箔点位库存 2022-10-10 14:00:42 +08:00
lyd
5d789ce187 生箔下料界面、手持登录 2022-10-10 09:36:02 +08:00
lyd
22f38f80cf 烘烤区库存 2022-10-09 17:00:18 +08:00
0e4bae7baf 代码更新 2022-10-09 16:27:20 +08:00
lyd
ce630b9ae3 分切区库存 2022-10-09 16:21:51 +08:00
ldj_willow
01b34aa808 代码更新 2022-10-09 16:20:43 +08:00
lyd
abf814d560 烘烤区 2022-10-09 15:50:25 +08:00
ldj_willow
00154727c3 是否字段更新 2022-10-09 15:46:43 +08:00
ldj_willow
0857c51f1d 代码更新 2022-10-09 15:34:46 +08:00
lyd
1a638e9d14 冷却区库存 2022-10-09 15:33:32 +08:00
ldj_willow
324fa05a39 代码更新 2022-10-09 14:09:49 +08:00
ldj_willow
e595a2c9a6 定时任务日志更新 2022-10-09 14:09:34 +08:00
ldj_willow
dc1ad3b88c 代码更新 2022-10-09 11:14:50 +08:00
ldj_willow
422c2f537b 代码更新 2022-10-09 11:14:33 +08:00
d497daef9b 代码更新 2022-10-09 10:52:18 +08:00
fc3eb03338 修改 2022-10-09 10:21:41 +08:00
lyd
12a7feca10 Merge branch 'master' of http://121.40.234.130:8899/root/nladmin
# Conflicts:
#	nladmin-system/pom.xml
#	nladmin-system/src/main/resources/config/application-dev.yml
2022-10-08 17:21:14 +08:00
lyd
3f565f7c51 token过期提示 2022-10-08 17:15:56 +08:00
5fc1250f82 兰州海亮项目初始化 2022-10-08 13:44:33 +08:00
lyd
7339fc11f0 表格列表、编码生成完善 2022-09-30 11:18:02 +08:00
lyd
ab4a9d5f3f 编码生成修改组件名 2022-09-30 09:37:18 +08:00
lyd
a2a9e94745 登录权限获取问题、头像名字居中 2022-09-29 09:31:12 +08:00
lyd
25a336fe72 jpa修改用户死循环、参数 2022-09-28 17:31:46 +08:00
lyd
2abfb67839 系统参数 2022-09-28 14:31:44 +08:00
ldj_willow
2a4bbd96e2 表格样式修改 2022-09-28 11:49:24 +08:00
ldj_willow
eec1ee9967 工具类和sass版本修改 2022-09-28 11:25:48 +08:00
ldj_willow
1b23deb9ea sass版本和工具类修改全局注入修改 2022-09-28 11:25:02 +08:00
lyd
db1096128f element-css 2022-09-28 10:56:05 +08:00
lyd
8cdaf561f7 日志系统 2022-09-28 10:09:34 +08:00
ldj_willow
c0e26c9767 代码重构 2022-09-28 09:45:43 +08:00
ldj_willow
9db0246c0e 代码重构 2022-09-28 09:44:27 +08:00
lyd
a820a7fdf5 session干扰 2022-09-28 08:55:14 +08:00
lyd
805792e5fa 去除岗位管理前后端代码 2022-09-26 17:47:03 +08:00
ldj_willow
948b0f8ac3 代码优化 2022-09-24 14:05:24 +08:00
ldj_willow
b661a69b0c 代码优化 2022-09-24 11:48:37 +08:00
lyd
9adb01e9c3 删除不要的模块 2022-09-23 12:25:42 +08:00
8eaf18b3bd 修改邮箱 2022-09-22 18:11:07 +08:00
8a78ac988f 修复代码 2022-09-22 18:08:06 +08:00
8e8730d0bf 删除不要的模块 2022-09-22 15:51:05 +08:00
2f149911ba token 无效 2022-09-22 14:16:30 +08:00
98deffce46 修复前端鉴权bug 2022-09-21 15:36:56 +08:00
ldj_willow
0bab0084a4 Merge branch 'master' of http://121.40.234.130:8899/root/nladmin 2022-09-21 10:19:31 +08:00