Commit Graph

712 Commits

Author SHA1 Message Date
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 6cd6940519 测试问题项修改 2024-05-29 10:57:05 +08:00
csyue 587ffc6eab 测试问题项修改 2024-05-29 09:12:30 +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 9eda3aa948 测试问题项修改 2024-05-28 18:30:04 +08:00
mashuai 6b89c6f089 盘点入库详情 2024-05-28 17:08:12 +08:00
csyue 43e0624cda 测试问题项修改 2024-05-28 15:50:36 +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
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
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
mashuai f8dd3dfeba bug 2024-05-24 14:55:07 +08:00
liang.chao 8c44207e86 代码提交 2024-05-17 14:04:40 +08:00
liang.chao 876e346a7e 报废导出和查询bug代码提交 2024-05-16 17:59:05 +08:00
liang.chao ecc0dc1ecf 首页关键字查询 2024-05-16 10:59:01 +08:00
mashuai 8f71e98681 bug 2024-05-15 15:58:46 +08:00
liang.chao db9afe3eaf 退料审核代码提交 2024-05-15 14:02:12 +08:00
liang.chao ec1c6141b1 退料审核代码提交 2024-05-15 13:22:40 +08:00
liang.chao aa1ced6f7c Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-05-15 10:30:05 +08:00
liang.chao 47628f51c1 领料通过代码优化 2024-05-15 10:29:51 +08:00
赵福海 c69007a1b9 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-05-15 10:13:41 +08:00
赵福海 5bc911baf8 待报废单号问题修复 2024-05-15 10:13:31 +08:00
mashuai 7426badbf3 bug-预报废审核列表 2024-05-15 09:15:42 +08:00
mashuai 2a8e060652 bug 2024-05-14 18:02:58 +08:00
liang.chao c20ea17df3 宁夏流程及数据权限修改 2024-05-14 17:51:35 +08:00
liang.chao 95b87226fa 宁夏流程及数据权限修改 2024-05-14 16:44:16 +08:00
mashuai 602054580a test 2024-05-13 09:27:11 +08:00
liang.chao 86dc06dd54 代码codeview 2024-05-10 17:05:24 +08:00
liang.chao 2c14888e0d 领料申请代码codeview 2024-05-10 15:22:15 +08:00
liang.chao ecdacc0143 领料管理列表展示问题提交 2024-05-10 11:06:49 +08:00
liang.chao 54d057f5b2 领料申请删除bug修改 2024-05-10 09:59:04 +08:00
liang.chao 7ef53ff9fe app退料接收无数据bug修改 2024-05-09 13:29:20 +08:00
mashuai eda8eac15d 权限 2024-05-08 18:43:46 +08:00
mashuai 99761fb49c 权限 2024-05-08 18:23:47 +08:00
BianLzhaoMin f6c1bdb1c7 冲突合并 2024-05-07 16:38:53 +08:00
liang.chao 8b5519223f 测试问题bug修改 2024-05-07 16:29:36 +08:00
15856 d92af0df79 导出预报废审核列表 2024-05-07 11:02:36 +08:00
mashuai 0f3675df58 bug 2024-05-07 10:21:12 +08:00
mashuai 75d2b02422 bug 2024-05-06 18:20:45 +08:00
liang.chao 25ad01ce71 bug修改提交 2024-05-06 17:59:30 +08:00
liang.chao 0cce5cc793 退料审核代码提交 2024-05-06 17:07:03 +08:00
15856 40736e1c85 催办,退料报废,维修报废,预报废审核,报废审核 2024-05-06 10:35:08 +08:00
mashuai 4c8a65cd54 大屏 2024-05-06 10:04:58 +08:00
BianLzhaoMin 688599a5b0 宁夏 冲突合并 2024-05-06 09:48:15 +08:00
liang.chao 52745e9a4e 退料审核代码提交 2024-05-06 09:42:49 +08:00
15856 834faeee43 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-30 17:51:44 +08:00
liang.chao bc8420e094 bug修改提交 2024-04-30 16:43:40 +08:00
mashuai 1ed94a6706 bug 2024-04-30 15:14:27 +08:00
15856 9bc4bc2f6e Merge remote-tracking branch 'origin/dev' into dev 2024-04-30 14:32:33 +08:00
15856 25f84100e6 bug修复 2024-04-30 14:32:17 +08:00
liang.chao 1030c78305 app领料申请详情bug提交 2024-04-30 14:09:40 +08:00
15856 1419b8c32d Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-30 13:11:10 +08:00
mashuai f23b73106a bug 2024-04-30 11:29:00 +08:00
liang.chao 6b002958d6 Merge remote-tracking branch 'origin/dev' into dev 2024-04-30 11:23:54 +08:00
liang.chao ffe7c67c6f 重庆领料审核修改后无数据bug 2024-04-30 11:23:49 +08:00
15856 bbf5d988f3 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-30 10:26:55 +08:00
liang.chao 763c003c34 新购验收查询接口添加 2024-04-30 09:09:34 +08:00
mashuai 88ac035ed7 bug 2024-04-29 18:43:22 +08:00
mashuai d1ed28a088 bug 2024-04-29 17:42:02 +08:00
mashuai d58c1b788d bug 2024-04-29 16:52:51 +08:00
syruan 7cef74aa24 物资LOG日志修订 2024-04-29 16:50:07 +08:00
mashuai 4f9cb5e37e 宁夏大屏二级页面 2024-04-29 14:38:15 +08:00
15856 bad5c11bdc Merge remote-tracking branch 'origin/dev' into dev-cq-bug 2024-04-28 16:41:10 +08:00
15856 660d90550a Bug修复 2024-04-28 16:23:43 +08:00
liang.chao c2aaa44f1b app联调代码提交 2024-04-28 16:16:29 +08:00
liang.chao a8d0461e37 退料申请查询在用量代码提交 2024-04-28 09:13:18 +08:00
15856 f5f2307232 Bug修复 2024-04-26 17:58:14 +08:00
liang.chao 86c204a632 字段别名添加 2024-04-26 17:52:15 +08:00
liang.chao bf0992137d 成套机具和退料申请当前在用量代码提交 2024-04-26 17:00:29 +08:00
15856 5051b6ae92 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-25 16:47:32 +08:00
15856 14822542ce Bug修复 2024-04-25 16:43:56 +08:00
15856 090fc6c17d Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-25 16:42:58 +08:00
liang.chao d293399415 成套机具代码提交 2024-04-25 16:30:04 +08:00
mashuai 0e681358a9 bug 2024-04-25 15:52:01 +08:00
mashuai ff893914d9 bug修改 2024-04-25 14:51:11 +08:00
mashuai 62aeaf6cfd bug修改 2024-04-25 13:08:53 +08:00
liang.chao 3ac38557af 成套机具代码提交 2024-04-24 17:59:17 +08:00
liang.chao 82e8a6db4a 退料审核代码提交 2024-04-24 14:05:18 +08:00
liang.chao 5490fd2e8f 成套抱杆机具验收 2024-04-23 17:36:00 +08:00
liang.chao 3fedcde616 sql提交 2024-04-23 09:35:44 +08:00
liang.chao 62f2330ffb 成套机具代码提交 2024-04-23 09:19:37 +08:00
csyue f94470a742 测试app问题项修改 2024-04-22 18:58:46 +08:00
mashuai f175c44ba1 整套抱杆 2024-04-22 11:28:36 +08:00
liang.chao b4c3540fb5 退料审核代码提交 2024-04-22 11:19:06 +08:00
mashuai a10c3dd8a7 bug 2024-04-22 10:20:29 +08:00
liang.chao b1fee78651 bug修改 2024-04-20 17:29:05 +08:00
mashuai e9deecdee5 Merge remote-tracking branch 'origin/dev' into dev 2024-04-20 16:58:45 +08:00
mashuai f1a3e8839b bug 2024-04-20 16:58:38 +08:00
hayu c180ad60e7 测试问题修改 2024-04-20 16:58:15 +08:00
mashuai 07c77c5ad3 bug 2024-04-20 16:01:30 +08:00
hayu a7d8ad5ef8 修饰入库不通过问题修改 2024-04-20 14:55:38 +08:00
sxu ff93691d19 回滚错误提交 2024-04-20 14:29:59 +08:00