Commit Graph

Select branches

Hide Pull Requests

dev

dev-cq

dev-cq-rudy20240806

dev-cq-rudy20240806b

dev-nw

dev-nwcc

dev-nwcc-test

dev-nx

dev-nx-rudy20240805

dev-nx-rudy20240806

dev-nx-sx20240821

dev-nx-sx20240821b

flow_dev

macode20240820

main

master

test

#1

#2

Mono Color

• d2e5a2269c 代码调试 BianLzhaoMin 2024-08-05 15:42:13 +0800
• 315b097635 代码合并 BianLzhaoMin 2024-08-05 15:19:09 +0800
• d2164f3287 代码合并 BianLzhaoMin 2024-08-05 15:16:17 +0800
• 005fea2b88 代码合并 BianLzhaoMin 2024-08-05 15:15:25 +0800
• cec0148f28 代码合并 BianLzhaoMin 2024-08-05 15:14:24 +0800
• 2d9eb46f38 代码合并 BianLzhaoMin 2024-08-05 15:13:53 +0800
• 695427d24a 代码合并 BianLzhaoMin 2024-08-05 15:13:06 +0800
• f9bf0d5b04 代码合并 BianLzhaoMin 2024-08-05 15:10:37 +0800
• 82a91f2bd1 代码合并 BianLzhaoMin 2024-08-05 15:07:12 +0800
• 6eb8d87bfa iot设备列表新增等接口调试完成 BianLzhaoMin 2024-08-05 14:41:51 +0800
• e7d790e423 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-08-05 13:37:15 +0800
• 53107ca921 IOT设备管理页面完善 BianLzhaoMin 2024-08-05 13:37:12 +0800
• 1666b6fafb Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx sxu 2024-08-05 13:33:05 +0800
• 93a46f8842 库存日志 sxu 2024-08-05 13:32:53 +0800
• 0f670f7ac5 IOT设备绑定查看 76164 2024-08-05 13:20:05 +0800
• da356b8535 库存日志 sxu 2024-08-05 10:58:26 +0800
• 6de9144844 库存日志 sxu 2024-08-05 10:57:32 +0800
• 6b4ca45b4a 数据推送功能开发 liang.chao 2024-08-05 10:33:52 +0800
• 484714a665 Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq sxu 2024-08-03 17:23:48 +0800
• a00cbbd709 月度结算 sxu 2024-08-03 17:23:37 +0800
• 55d92c49d3 结算管理功能开发 liang.chao 2024-08-03 17:21:01 +0800
• 30763bfd81 numlog sxu 2024-08-02 20:37:06 +0800
• a601570356 numlog sxu 2024-08-02 20:27:12 +0800
• 7f323f3e50 numlog sxu 2024-08-02 20:13:46 +0800
• 0107d9be5a 页面优化 BianLzhaoMin 2024-08-02 18:10:57 +0800
• 167dc7d5ae numlog sxu 2024-08-02 16:47:09 +0800
• 91858692ed 优化页面提示 BianLzhaoMin 2024-08-02 16:36:40 +0800
• eaf3dff8e3 优化页面 BianLzhaoMin 2024-08-02 16:03:01 +0800
• 524d83deec 优化结算页面 BianLzhaoMin 2024-08-02 15:43:25 +0800
• 95c7b914c1 优化结算页面 BianLzhaoMin 2024-08-02 15:38:47 +0800
• 66f76ac918 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx sxu 2024-08-02 15:18:47 +0800
• 1faca3177d 库存日志相关字段修改-2 FrancisHu 2024-08-02 15:18:17 +0800
• c6e91f3592 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx sxu 2024-08-02 15:15:33 +0800
• 95e5aa87e3 库存日志相关字段修改 FrancisHu 2024-08-02 15:14:59 +0800
• 4d54331c02 numlog sxu 2024-08-02 15:14:56 +0800
• 40e2dc42a1 结算功能优化 BianLzhaoMin 2024-08-02 14:01:59 +0800
• 10282de5ef numlog sxu 2024-08-02 09:25:14 +0800
• fcb3780c93 numlog sxu 2024-08-01 20:30:13 +0800
• c5940da435 完成部分退料功能 sxu 2024-08-01 18:26:51 +0800
• f36fc6f0dd Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-08-01 18:03:44 +0800
• 44fc4eaa98 优化维修页面配件收费问题 BianLzhaoMin 2024-08-01 18:03:42 +0800
• 40c37af130 结算页面优化 BianLzhaoMin 2024-08-01 16:06:28 +0800
• 0c227faf44 退料模块相关字段修改 FrancisHu 2024-08-01 15:43:11 +0800
• e7f64beeb5 优化页面 BianLzhaoMin 2024-08-01 11:21:26 +0800
• 2b65a0fd6c 页面优化 BianLzhaoMin 2024-08-01 10:18:05 +0800
• 0982fb226d 接收详情页优化 BianLzhaoMin 2024-08-01 09:35:39 +0800
• 750e82af79 配置文件数据库和redis账号密码加密 mashuai 2024-08-01 09:04:27 +0800
• 50469522ef 加解密 mashuai 2024-08-01 09:03:01 +0800
• afb59c05fb Merge branch 'dev-nwcc' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nwcc BianLzhaoMin 2024-07-31 18:03:59 +0800
• bea1a53543 设备接收接口调试完成 BianLzhaoMin 2024-07-31 18:03:57 +0800
• 1497d38315 领料出库恢复限制 FrancisHu 2024-07-31 15:03:30 +0800
• 3dc40d156c 数据库账号密码加密 15856 2024-07-31 13:53:33 +0800
• ab24cae703 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-07-31 13:35:15 +0800
• bee9a5d675 字段优化 BianLzhaoMin 2024-07-31 13:34:42 +0800
• db655a510f 禅道bug解决 liang.chao 2024-07-31 13:34:20 +0800
• 6c169348cf 页面优化 BianLzhaoMin 2024-07-31 13:05:54 +0800
• ab25097299 页面字段优化 BianLzhaoMin 2024-07-31 09:17:51 +0800
• 98f6d42010 结算管理代码提交 liang.chao 2024-07-30 17:22:25 +0800
• 2881dfed87 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-07-30 16:22:55 +0800
• 2d435fa2ca 字段调整 BianLzhaoMin 2024-07-30 16:22:50 +0800
• ea13b5f59e Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq BianLzhaoMin 2024-07-30 16:21:10 +0800
• b1b184b23f 结算页面导出接口调试完成 BianLzhaoMin 2024-07-30 16:21:06 +0800
• a2776309e4 加解密 mashuai 2024-07-30 16:13:50 +0800
• 988e77caba 配置文件数据库和redis账号密码加密 mashuai 2024-07-30 16:10:38 +0800
• 800c97fb94 完成部分退料功能 sxu 2024-07-30 16:07:50 +0800
• 9ef0b256aa 退料接收新增字段 FrancisHu 2024-07-30 15:44:04 +0800
• 7f39194cc4 领料模块新增排序 FrancisHu 2024-07-30 13:04:16 +0800
• 9d00e3fa17 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx sxu 2024-07-30 12:47:22 +0800
• aec62975ba 领料申请和审核页排序 sxu 2024-07-30 12:47:11 +0800
• a591d01bb3 优化结算页面 BianLzhaoMin 2024-07-30 11:07:51 +0800
• d0aec00ce0 iot设备绑定 mashuai 2024-07-30 10:48:58 +0800
• 7c42f093d4 Merge remote-tracking branch 'origin/dev-nwcc' into dev-nwcc mashuai 2024-07-30 10:46:09 +0800
• 0c0c5d9479 租赁推送 mashuai 2024-07-30 10:45:56 +0800
• 41aed42279 配置文件数据库和redis账号密码加密 mashuai 2024-07-30 10:44:03 +0800
• b6b23815d5 配置文件数据库和redis账号密码加密 mashuai 2024-07-30 10:31:57 +0800
• 94552bc1b1 配置文件数据库和redis账号密码加密 mashuai 2024-07-30 09:45:33 +0800
• 59381742d7 仓储推送到租赁平台 15856 2024-07-30 09:43:26 +0800
• aa6234f8ca 领料模块新增排序下拉选-待退料数量不可编辑 FrancisHu 2024-07-30 09:40:15 +0800
• 041fcbd788 退料接收按钮恢复 FrancisHu 2024-07-30 09:14:07 +0800
• 10bf893ff4 去除退料审核 sxu 2024-07-29 19:05:09 +0800
• 40c3cc5498 Merge remote-tracking branch 'origin/dev-cq' into dev-cq liang.chao 2024-07-29 18:27:52 +0800
• 4a71b8e634 结算管理代码提交 liang.chao 2024-07-29 18:27:41 +0800
• a5635d173a 完工结算接口调试完成 BianLzhaoMin 2024-07-29 18:25:49 +0800
• 432602333b 仓储推送到租赁平台 15856 2024-07-29 17:37:08 +0800
• c979a28e26 领料模块新增单位类型字段-退料模块相关优化 76164 2024-07-29 17:12:07 +0800
• 5eed3fb545 退料单去除审核字段 FrancisHu 2024-07-29 16:49:34 +0800
• c0aa735d29 仓储推送到租赁平台 15856 2024-07-29 16:33:13 +0800
• 190b08aa0a 退料各模块去除若干状态筛选条件 FrancisHu 2024-07-29 15:46:52 +0800
• 62ed341ec5 去除退料审核 sxu 2024-07-29 15:27:31 +0800
• c30d7aa355 页面优化 BianLzhaoMin 2024-07-29 14:19:06 +0800
• 94327108e2 结算页面优化 BianLzhaoMin 2024-07-29 14:01:07 +0800
• 027b891f69 配置文件加密 mashuai 2024-07-29 13:07:01 +0800
• 6797a94659 Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq BianLzhaoMin 2024-07-29 11:49:32 +0800
• 25137a0fb4 结算页面优化 BianLzhaoMin 2024-07-29 11:49:26 +0800
• 2cc41e1896 领料出库去除数量限制 76164 2024-07-29 10:11:57 +0800
• 3c54729c87 仓储推送到租赁平台 15856 2024-07-29 09:29:39 +0800
• 6b48590986 配件EXCEL导入功能 76164 2024-07-29 09:15:15 +0800
• ae3cbecb52 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-07-26 18:03:42 +0800
• 3820f4d3f4 页面样式优化 BianLzhaoMin 2024-07-26 18:03:39 +0800
• 4cf99e9f99 供应商导出 liang.chao 2024-07-26 17:45:29 +0800