Commit Graph

650 Commits

Author SHA1 Message Date
FrancisHu 2b82d31bf1 2.28新增查询 2024-02-28 13:31:56 +08:00
FrancisHu abd8c517a5 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-02-28 09:52:02 +08:00
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
zhouzy062 15c8119f94 租赁平台登录 2024-02-27 18:02:33 +08:00
1539530615@qq.com 8b1ecec6c1 结算代码提交 2024-02-27 17:16:51 +08:00
FrancisHu 6374843a63 2.27新增查询 2024-02-27 17:01:49 +08:00
liang.chao 201f7d4f5c 商城登录接口 2024-02-27 16:31:38 +08:00
liang.chao 5b0e807b29 退料申请表数据问题修改 2024-02-27 16:02:01 +08:00
liang.chao 80f6ea3154 Merge remote-tracking branch 'origin/dev' into dev 2024-02-27 14:34:52 +08:00
liang.chao 2b8f984cd8 退料申请表数据问题修改 2024-02-27 14:34:44 +08:00
zhouzy062 73e07c5bf8 退料 2024-02-27 14:13:21 +08:00
liang.chao c82d744963 Merge remote-tracking branch 'origin/dev' into dev 2024-02-27 14:07:57 +08:00
liang.chao 32b1dc4932 退料申请表数据问题修改 2024-02-27 14:07:45 +08:00
zhouzy062 df24c7e4bf 退料优化 2024-02-27 14:07:01 +08:00
liang.chao 747640caba 退料申请表数据问题修改 2024-02-27 13:20:31 +08:00
zhouzy062 f77902ad2c 领料申请接口修改 2024-02-27 10:33:50 +08:00
zhouzy062 f42b926b71 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-02-26 20:16:24 +08:00
zhouzy062 76ce215d1f 领料管理 2024-02-26 20:16:16 +08:00
bns_han cb2d8a551a 综合查询 2024-02-26 19:28:18 +08:00
zhouzy062 d4c9beff5e 领料审批权限 2024-02-26 18:43:14 +08:00
bonus 1856249b0e 综合查询-领料查询 2024-02-26 14:14:19 +08:00
bonus 2861b288be 综合查询 2024-02-26 14:06:58 +08:00
zhouzy062 ad775627c5 费用结算 2024-02-26 10:17:48 +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
liang.chao 9ca45416b3 领料申请和管理数据隔离 2024-02-22 17:02:04 +08:00
zhouzy062 7942e4a93d 领料内部审核前端代码 2024-02-22 13:56:32 +08:00
liang.chao 20915ca52c 注册问题修改 2024-02-22 10:38:26 +08:00
liang.chao 98339ff568 退料审核通过 2024-02-21 20:22:34 +08:00
liang.chao fc31e413c9 领料申请通过流程 2024-02-21 19:24:08 +08:00
zhouzy062 51d2ae84ca Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-02-21 18:28:49 +08:00
zhouzy062 ec04b2770e 新购验收机具配件验收入库驳回 2024-02-21 18:27:47 +08:00
bns_han 12ef28f592 功能完善 2024-02-21 18:26:53 +08:00
bns_han 3474556833 功能完善 2024-02-20 18:09:36 +08:00
liang.chao 23bef43401 Merge remote-tracking branch 'origin/dev' into dev 2024-02-20 18:04:19 +08:00
liang.chao 5dd287a0b7 南网注册和领料数据权限修改 2024-02-20 18:04:13 +08:00
bns_han 2886d4946b 新购驳回 2024-02-20 14:01:15 +08:00
1539530615@qq.com e900a0c3fe 领料申请代码提交 2024-02-20 13:57:26 +08:00
liang.chao c4630625d3 领料申请通过和驳回逻辑修改 2024-02-19 17:48:42 +08:00
1539530615@qq.com 055ae63020 修饰管理代码提交 2024-02-18 17:59:38 +08:00
bns_han 82a3371114 综合查询--工程在用查询 2024-02-18 17:31:32 +08:00
liang.chao ac5f82ea3f 新购器具绑定rfidCode 2024-02-18 17:19:56 +08:00
bns_han b0835e5473 功能完善 2024-02-18 11:10:28 +08:00
bns_han 1ef299d409 Merge remote-tracking branch 'origin/test' into dev 2024-02-18 10:55:08 +08:00
bns_han ab4ba2cab8 功能完善 2024-02-18 10:50:30 +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