Commit Graph

37 Commits

Author SHA1 Message Date
cd1ba55b26 优化 2026-03-13 10:30:55 +08:00
zc
687be5840e Merge branch 'refs/heads/master_lz' 2026-03-12 20:20:46 +08:00
zc
d9f808ecc1 tcp服务启动 2026-03-12 19:45:07 +08:00
c1d84aaf81 优化 2026-03-12 16:54:55 +08:00
zc
dec15eb913 tcp服务启动 2026-03-11 17:53:58 +08:00
18e014d9cb Merge branch 'master' into master_lz 2026-03-11 17:44:57 +08:00
2cb03b146a tcp服务 2026-03-11 17:44:06 +08:00
zc
7d48c78c9b 海康工业相机优化关闭socket视频重连异常 2026-03-11 17:39:05 +08:00
zc
c80dce6419 海康工业相机对接彩色视频流 2026-03-11 15:05:14 +08:00
zc
4802e11f7c 海康工业相机对接优化视频流 2026-03-11 11:09:56 +08:00
zc
fde2f18ff5 海康工业相机对接黑白画面 2026-03-11 10:55:59 +08:00
zc
41e0b0b5b4 添加海康工业相机demo代码 2026-03-10 16:54:45 +08:00
zc
fb05360c5e 代码优化 2026-03-09 20:33:47 +08:00
e4d6de61ae Merge branch 'refs/heads/master' into master_lz 2026-03-06 17:59:47 +08:00
73c1bc9d01 称重抓取 2026-03-06 17:58:55 +08:00
zc
ae9a607da1 代码优化 2026-03-06 15:55:06 +08:00
32f88b1443 物料查询返回错误提示 2026-03-06 15:41:12 +08:00
zc
c59df81b38 电子秤设备&优化 2026-03-05 18:13:39 +08:00
zc
66449b0482 电子秤设备 2026-03-05 16:02:36 +08:00
5726239eda 优化用户重置密码加密+物料照片批量导入 2026-03-05 14:39:20 +08:00
656267e6b7 Merge branch 'refs/heads/master' into master_lz
# Conflicts:
#	wms-module-system/src/main/java/top/wms/admin/material/service/MaterialInfoService.java
#	wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java
2026-03-05 14:27:48 +08:00
zc
381c1638e3 优化追溯 2026-03-04 18:05:00 +08:00
d95f527938 Merge branch 'master' into master_lz 2026-03-04 18:02:30 +08:00
97df87eb06 优化 2026-03-04 18:01:13 +08:00
zc
b98a0f06ba 优化称重 2026-03-03 17:58:57 +08:00
zc
15af775af4 Merge remote-tracking branch 'refs/remotes/origin/master_lz'
# Conflicts:
#	wms-module-system/src/main/java/top/wms/admin/auth/handler/CardLoginHandler.java
2026-03-03 15:26:12 +08:00
zc
85e9e5d110 优化登录 2026-03-03 15:24:48 +08:00
b37300ef8c 优化 2026-03-03 15:03:31 +08:00
b54e1e314a Merge branch 'refs/heads/master' into master_lz
# Conflicts:
#	wms-module-system/src/main/java/top/wms/admin/auth/AbstractLoginHandler.java
#	wms-module-system/src/main/java/top/wms/admin/auth/handler/SocialLoginHandler.java
2026-03-03 14:21:14 +08:00
3082c24e13 优化 2026-03-03 14:19:20 +08:00
zc
7e7db23d82 优化 2026-03-03 11:42:23 +08:00
3892fffa37 Merge remote-tracking branch 'origin/master' 2026-03-03 11:35:47 +08:00
c7547e27e6 新增物料用户修改 2026-03-03 11:35:19 +08:00
zc
2da90f8526 删除 2026-02-27 11:31:48 +08:00
zc
23844ee4dd 删除 2026-02-27 10:59:57 +08:00
zc
86527b9c21 改名 2026-02-27 10:50:07 +08:00
zc
0ee56404c2 first commit 2026-02-27 10:16:46 +08:00