zhoujj
|
1af4adcd48
|
fix 修改
|
2026-03-23 16:38:28 +08:00 |
|
zhoujj
|
cfdc93c0ac
|
add 宜宾东磁的导出
|
2025-04-27 17:03:44 +08:00 |
|
zhoujj
|
78a3ce6a5e
|
add 驱动代码
|
2025-01-07 09:27:33 +08:00 |
|
zhoujj
|
9a824161a3
|
fix 读取kep和打印驱动
|
2025-01-03 17:49:01 +08:00 |
|
zhoujj
|
94a1a69ee1
|
rev 更新工单和打印机驱动
|
2024-12-20 16:04:34 +08:00 |
|
zhoujj
|
92eab4db8f
|
add 代码提交
|
2024-12-11 12:17:12 +08:00 |
|
zhangzq
|
34c7449845
|
add:com口读取工具
|
2024-11-05 16:13:59 +08:00 |
|
zhangzq
|
383fe20168
|
add:com口读取工具
|
2024-11-05 16:07:14 +08:00 |
|
zhangzq
|
6dae0474c0
|
add:com口读取工具
|
2024-11-05 16:06:43 +08:00 |
|
周俊杰
|
9de4204626
|
add 串口工具测试
|
2024-11-05 15:32:58 +08:00 |
|
zhangzq
|
e0d9e1ad27
|
add:添加socket打印
|
2024-10-29 20:22:05 +08:00 |
|
周俊杰
|
ad380c20ae
|
add 模板打印
|
2024-10-29 16:56:39 +08:00 |
|
周俊杰
|
9b20f34f84
|
add 工单打印模板
|
2024-10-22 14:33:54 +08:00 |
|
周俊杰
|
4a04171237
|
add 工单功能打印功能完善
|
2024-10-14 17:31:46 +08:00 |
|
周俊杰
|
043f25e9ac
|
fix 模板管理功能修改
|
2024-08-07 10:37:57 +08:00 |
|
yanps
|
1d3db3b9f1
|
add: 添加模板管理页面
|
2024-07-30 10:20:49 +08:00 |
|
yanps
|
6a7d5fe8f8
|
opt: 表单优化
|
2024-07-25 17:45:07 +08:00 |
|
yanps
|
9e9c2db5e0
|
add: 初始化
|
2024-07-25 14:11:35 +08:00 |
|
周俊杰
|
ecdca5b88a
|
Add 'lms/' from commit '43135a90ac0378341bf64a1240288230e3e9a419'
git-subtree-dir: lms
git-subtree-mainline: 284e9bb629
git-subtree-split: 43135a90ac
|
2024-06-05 17:15:28 +08:00 |
|
周俊杰
|
284e9bb629
|
Add 'acs/' from commit '83816781f8c26a15e081a5746c83a3c9ea56fb90'
git-subtree-dir: acs
git-subtree-mainline: b86787e9d6
git-subtree-split: 83816781f8
|
2024-06-05 17:14:41 +08:00 |
|
周俊杰
|
b86787e9d6
|
init
|
2024-06-05 17:13:30 +08:00 |
|
|
|
83816781f8
|
test: 测试提交
|
2024-06-05 16:07:59 +08:00 |
|
|
|
9e533f5d90
|
test: 测试提交
|
2024-06-05 15:59:28 +08:00 |
|
|
|
694be67936
|
Merge remote-tracking branch 'origin/admin' into acs_v1.0.0
# Conflicts:
# nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
# nladmin-system/nlsso-server/src/main/resources/config/application.yml
|
2024-06-05 15:06:10 +08:00 |
|
|
|
43135a90ac
|
Merge remote-tracking branch 'origin/admin' into lms_v1.0.0
|
2024-06-05 15:00:39 +08:00 |
|
|
|
77271cc801
|
rev: admin 配置文件
|
2024-06-05 14:59:51 +08:00 |
|
|
|
b8561580d5
|
rev: acs 修复国际化
|
2024-06-03 16:21:36 +08:00 |
|
|
|
c9308d3f0d
|
fix: acs_v1.0.0 修复bug
|
2024-06-03 15:31:19 +08:00 |
|
|
|
b366e7f4c5
|
Merge remote-tracking branch 'origin/admin' into lms_v1.0.0
|
2024-05-31 09:00:44 +08:00 |
|
|
|
bff324b280
|
Merge remote-tracking branch 'origin/admin' into admin
|
2024-05-31 08:52:21 +08:00 |
|
|
|
adafb2cec5
|
rev: admin 修复国际化
|
2024-05-31 08:52:10 +08:00 |
|
ludj
|
9c0db5c954
|
rev：代码修改
|
2024-05-30 18:09:52 +08:00 |
|
|
|
9f050bd0ed
|
rev: acs api位置挪动
|
2024-05-29 18:26:09 +08:00 |
|
|
|
101d3d471b
|
Merge remote-tracking branch 'origin/admin' into acs_v1.0.0
|
2024-05-29 16:15:00 +08:00 |
|
|
|
19a263caf6
|
Merge remote-tracking branch 'origin/admin' into lms_v1.0.0
|
2024-05-29 16:13:01 +08:00 |
|
|
|
7659065a68
|
rev: api位置挪动
|
2024-05-29 15:16:08 +08:00 |
|
|
|
ae5d265bc1
|
fix: 添加缺省国际化
|
2024-05-29 14:38:26 +08:00 |
|
|
|
bcdba380cc
|
Merge remote-tracking branch 'origin/admin' into acs_v1.0.0
# Conflicts:
# nladmin-ui/src/i18n/langs/chinese.js
# nladmin-ui/src/i18n/langs/english.js
# nladmin-ui/src/i18n/langs/indonesian.js
# nladmin-ui/src/i18n/langs/task/en.js
# nladmin-ui/src/i18n/langs/task/in.js
# nladmin-ui/src/i18n/langs/task/zh.js
# nladmin-ui/src/views/monitor/online/locale/en.js
# nladmin-ui/src/views/monitor/online/locale/in.js
# nladmin-ui/src/views/monitor/online/locale/zh.js
# nladmin-ui/src/views/system/dept/locale/en.js
# nladmin-ui/src/views/system/dept/locale/in.js
# nladmin-ui/src/views/system/dept/locale/zh.js
# nladmin-ui/src/views/system/notice/locale/en.js
# nladmin-ui/src/views/system/notice/locale/in.js
# nladmin-ui/src/views/system/notice/locale/zh.js
# nladmin-ui/src/views/system/redis/locale/en.js
# nladmin-ui/src/views/system/redis/locale/in.js
# nladmin-ui/src/views/system/redis/locale/zh.js
# nladmin-ui/src/views/system/timing/locale/corn/en.js
# nladmin-ui/src/views/system/timing/locale/corn/in.js
# nladmin-ui/src/views/system/timing/locale/corn/zh.js
# nladmin-ui/src/views/system/timing/locale/en.js
# nladmin-ui/src/views/system/timing/locale/in.js
# nladmin-ui/src/views/system/timing/locale/zh.js
# nladmin-ui/src/views/tools/codeGen/locale/en.js
# nladmin-ui/src/views/tools/codeGen/locale/in.js
# nladmin-ui/src/views/tools/codeGen/locale/zh.js
# nladmin-ui/src/views/tools/storage/locale/en.js
# nladmin-ui/src/views/tools/storage/locale/in.js
# nladmin-ui/src/views/tools/storage/locale/zh.js
|
2024-05-29 09:51:35 +08:00 |
|
|
|
7f57246adf
|
fix: 添加缺省国际化
|
2024-05-29 09:40:49 +08:00 |
|
|
|
0640811a60
|
Merge remote-tracking branch 'origin/admin' into lms_v1.0.0
|
2024-05-29 09:10:58 +08:00 |
|
|
|
bba3cdc35b
|
rev: i18n位置挪动
|
2024-05-29 09:09:47 +08:00 |
|
|
|
bcb6d51f2f
|
Merge remote-tracking branch 'origin/admin' into lms_v1.0.0
|
2024-05-28 17:17:55 +08:00 |
|
|
|
9b0bf8f73e
|
fix: acs_v1.0.0 lucene位置
|
2024-05-28 17:09:05 +08:00 |
|
|
|
9a44f38d7f
|
Merge remote-tracking branch 'origin/admin' into acs_v1.0.0
|
2024-05-28 17:04:11 +08:00 |
|
ludj
|
df89d088a3
|
代码格式调整
|
2024-05-28 16:31:14 +08:00 |
|
|
|
157aea57b1
|
Merge remote-tracking branch 'origin/admin' into lms_v1.0.0
|
2024-05-28 16:04:13 +08:00 |
|
|
|
bdf2bcf569
|
Merge remote-tracking branch 'origin/admin' into acs_v1.0.0
|
2024-05-28 16:02:21 +08:00 |
|
ludj
|
8bf43d5cc7
|
前端样式修改
|
2024-05-28 16:02:04 +08:00 |
|
|
|
4237306bc0
|
fix: 日志管理国际化
|
2024-05-28 16:00:18 +08:00 |
|
|
|
59d742dbd4
|
Merge remote-tracking branch 'origin/admin' into acs_v1.0.0
|
2024-05-28 15:57:56 +08:00 |
|
