Commit Graph

162 Commits

Author SHA1 Message Date
bns_han f38110f2dc 综合查询 2024-02-27 18:52:09 +08:00
bns_han b6de4c1d84 综合查询 2024-02-27 18:44:28 +08:00
liang.chao 3878c5a23f 退料申请表数据问题修改 2024-02-27 18:06:01 +08:00
1539530615@qq.com 8b1ecec6c1 结算代码提交 2024-02-27 17:16:51 +08:00
liang.chao 32b1dc4932 退料申请表数据问题修改 2024-02-27 14:07:45 +08:00
bns_han cb2d8a551a 综合查询 2024-02-26 19:28:18 +08:00
liang.chao d0068ab35d 退料申请、管理数据权限问题 2024-02-26 09:03:07 +08:00
liang.chao baa645f36b 退料申请表数据问题修改 2024-02-23 17:26:16 +08:00
1539530615@qq.com 7bbad756b1 结算代码提交 2024-02-23 11:13:41 +08:00
bns_han bd05a25423 功能完善 2024-02-23 10:31:25 +08:00
bns_han 12ef28f592 功能完善 2024-02-21 18:26:53 +08:00
bns_han 2886d4946b 新购驳回 2024-02-20 14:01:15 +08:00
1539530615@qq.com 055ae63020 修饰管理代码提交 2024-02-18 17:59:38 +08:00
liang.chao ac5f82ea3f 新购器具绑定rfidCode 2024-02-18 17:19:56 +08:00
bns_han 1ef299d409 Merge remote-tracking branch 'origin/test' into dev 2024-02-18 10:55:08 +08:00
bns_han 26266f1399 Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/GlobalConstants.java
#	sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java
#	sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
2024-02-18 10:47:20 +08:00
1539530615@qq.com 0b5bc3ec52 修饰管理代码提交 2024-02-18 09:36:59 +08:00
bns_han 87ef699f84 新购驳回 2024-02-01 10:00:10 +08:00
bns_han 49b4ae203b 代码规范 2024-01-31 14:10:59 +08:00
zhouzy062 d801158d54 合并 2024-01-31 13:57:52 +08:00
zhouzy062 2ed5a78cec Merge remote-tracking branch 'origin/dev' into test 2024-01-31 13:57:12 +08:00
liang.chao 820e6dd77e 代码规范修改 2024-01-30 17:16:19 +08:00
liang.chao 586728fae3 南网oss登录接口修改 2024-01-30 16:28:46 +08:00
liang.chao 6c75a099ef 南网oss登录接口修改 2024-01-30 15:55:55 +08:00
liang.chao 451b56c0ba 南网oss登录接口修改 2024-01-30 15:06:15 +08:00
zhouzy062 c1dc8fe5ec Merge branch 'dev' into test 2024-01-30 13:57:31 +08:00
1539530615@qq.com 8bf9558fc5 问题修改 2024-01-30 13:21:41 +08:00
1539530615@qq.com 44e655e0b6 问题修改 2024-01-30 10:10:58 +08:00
1539530615@qq.com e1dc6d5512 Merge branch 'dev' into test 2024-01-29 17:59:12 +08:00
1539530615@qq.com 2e4972279a 问题修改 2024-01-29 17:58:33 +08:00
1539530615@qq.com 50740168aa Merge branch 'dev' into test 2024-01-29 17:20:03 +08:00
1539530615@qq.com 21ad852102 维修问题修改 2024-01-29 17:11:02 +08:00
bns_han dcb492aee6 功能完善 2024-01-29 15:59:30 +08:00
1539530615@qq.com 3ed2f429a8 Merge branch 'dev' into test 2024-01-26 13:04:22 +08:00
1539530615@qq.com 1839e0537c 报废审核驳回修改 2024-01-26 13:03:26 +08:00
bns_han 57130c2559 功能完善 2024-01-26 11:27:27 +08:00
liang.chao 7c741a45af 线上bug修改 2024-01-25 14:11:30 +08:00
1539530615@qq.com e62aa0f71c 维修审核驳回修改 2024-01-25 13:16:01 +08:00
1539530615@qq.com 214b92688b 漏洞修改 2024-01-24 19:27:55 +08:00
bns_han 96020c4510 功能完善 2024-01-24 18:33:38 +08:00
1539530615@qq.com 24c927baa2 维修审核修改 2024-01-24 18:23:16 +08:00
1539530615@qq.com f8e8651894 维修修改 2024-01-24 16:13:32 +08:00
liang.chao 96b479c2f8 pom打包提交 2024-01-24 14:48:24 +08:00
1539530615@qq.com b0ab60c20f 维修修改 2024-01-24 14:39:17 +08:00
1539530615@qq.com 7370cab29a 维修修改 2024-01-24 14:19:18 +08:00
bns_han 367ad3f33e Merge remote-tracking branch 'origin/test' into dev 2024-01-24 11:30:37 +08:00
bns_han 382bc7b6f3 功能完善 2024-01-24 11:29:30 +08:00
1539530615@qq.com f20bb2ee9b 试验检验审核驳回修改 2024-01-24 11:16:21 +08:00
bns_han 61c5472b16 功能完善 2024-01-23 21:08:23 +08:00
1539530615@qq.com d595a6b80a 试验检验审核驳回修改 2024-01-23 21:07:13 +08:00