Commit Graph

17 Commits

Author SHA1 Message Date
zc
c59df81b38 电子秤设备&优化 2026-03-05 18:13:39 +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
c7547e27e6 新增物料用户修改 2026-03-03 11:35:19 +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