Commit Graph

1512 Commits

Author SHA1 Message Date
mashuai 08c783d797 bug 2024-05-29 14:31:15 +08:00
BianLzhaoMin b13667f377 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-05-29 14:21:46 +08:00
BianLzhaoMin ac1d192df7 领料申请页面字段微调 2024-05-29 14:21:42 +08:00
csyue 564d5259f4 测试问题项修改 2024-05-29 13:13:45 +08:00
csyue e314a4c4b1 测试问题项修改 2024-05-29 13:06:56 +08:00
csyue 5740d5841d 测试问题项修改 2024-05-29 12:47:49 +08:00
csyue 88dc90fa49 测试问题项修改 2024-05-29 12:44:54 +08:00
csyue 12a3cc8887 测试问题项修改 2024-05-29 11:52:59 +08:00
csyue c2ea36160f 测试问题项修改 2024-05-29 11:24:18 +08:00
csyue f0db05ce34 测试问题项修改 2024-05-29 11:02:12 +08:00
csyue a072242325 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-05-29 10:58:12 +08:00
csyue 6cd6940519 测试问题项修改 2024-05-29 10:57:05 +08:00
BianLzhaoMin b43a8e501e Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-05-29 10:47:35 +08:00
BianLzhaoMin 3be3fd24eb 优化页面展示,增加分公司审核按钮判断 2024-05-29 10:47:32 +08:00
csyue fcbc5f720e Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-05-29 09:12:37 +08:00
csyue 587ffc6eab 测试问题项修改 2024-05-29 09:12:30 +08:00
BianLzhaoMin 0a8d75d077 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-05-28 18:42:24 +08:00
BianLzhaoMin 7de764f72c 盘点入库页面优化 2024-05-28 18:42:17 +08:00
csyue fd998f1b41 测试问题项修改 2024-05-28 18:37:58 +08:00
csyue 84d718b9bc Merge remote-tracking branch 'origin/dev-nx' into dev-nx
# Conflicts:
#	sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
2024-05-28 18:36:05 +08:00
csyue ac4ee525d2 测试问题项修改 2024-05-28 18:31:22 +08:00
csyue 9eda3aa948 测试问题项修改 2024-05-28 18:30:04 +08:00
mashuai 6b89c6f089 盘点入库详情 2024-05-28 17:08:12 +08:00
BianLzhaoMin 85997e5401 增加盘点入库详情查询功能 2024-05-28 16:54:30 +08:00
csyue 43e0624cda 测试问题项修改 2024-05-28 15:50:36 +08:00
csyue fba49bc8ed Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-05-28 15:50:29 +08:00
BianLzhaoMin d2a843ef07 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-05-28 14:56:03 +08:00
BianLzhaoMin bf1ad92297 解决列表序号延续问题 2024-05-28 14:55:56 +08:00
csyue 72751401cf Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-05-28 11:41:35 +08:00
mashuai 1c4fe61c2a bug 2024-05-28 11:36:42 +08:00
mashuai 33b5c177a9 bug 2024-05-28 11:30:00 +08:00
BianLzhaoMin 7174769903 解除重置密码跳转逻辑 2024-05-28 11:27:39 +08:00
csyue 86419027c1 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-05-28 10:38:31 +08:00
BianLzhaoMin 81544d580c Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-05-28 10:37:46 +08:00
BianLzhaoMin 5d53a58d78 解除密码加密 2024-05-28 10:37:43 +08:00
mashuai f5ffe11ec9 bug 2024-05-28 10:29:31 +08:00
csyue 0b37588854 测试问题项修改 2024-05-28 09:43:10 +08:00
csyue 02e4f72d97 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-05-28 09:38:41 +08:00
mashuai a79ab95fe0 bug 2024-05-28 09:29:29 +08:00
mashuai e2b9f17790 bug 2024-05-28 09:10:12 +08:00
csyue f766d1ae97 测试问题项修改 2024-05-27 20:45:12 +08:00
mashuai dd31e09009 手机号验证码次数限制 2024-05-27 18:42:32 +08:00
mashuai 3ebb67dd24 bug 2024-05-27 17:40:18 +08:00
BianLzhaoMin 6b4e876aee Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-05-27 16:33:17 +08:00
BianLzhaoMin c0ac8806c8 优化登录页面图形验证码校验问题 2024-05-27 16:33:12 +08:00
mashuai 3e93e0ff4b bug 2024-05-27 16:30:00 +08:00
mashuai ba74371330 用户加解密 2024-05-25 16:35:50 +08:00
mashuai c45eb9c65b 盘点入库 2024-05-25 16:03:46 +08:00
binbin_pan 2d37e70125 去除采购员下拉 多余的请选择选项 2024-05-25 12:24:59 +08:00
mashuai 771daa7cd2 用户加解密 2024-05-24 19:38:26 +08:00