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

• 5dd2e64dc1 代码优化 BianLzhaoMin 2024-09-20 17:39:26 +0800
• 5801485f1b Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-09-20 14:24:47 +0800
• 8be2a24957 代码优化 BianLzhaoMin 2024-09-20 14:24:39 +0800
• 26ceb64cde app退料盛情状态修改 liang.chao 2024-09-19 17:39:10 +0800
• b70753ec60 Merge remote-tracking branch 'origin/dev-nx' into dev-nx liang.chao 2024-09-19 16:22:32 +0800
• c6aeeb9e81 app退料盛情状态修改 liang.chao 2024-09-19 16:22:27 +0800
• 0511da6b4e 代码优化 BianLzhaoMin 2024-09-19 15:55:02 +0800
• 9ec44744da Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-09-19 13:22:44 +0800
• 3bd1249b07 大屏问题调试 BianLzhaoMin 2024-09-19 13:22:34 +0800
• f5060f4a7b 宁夏NGINX配置 liang.chao 2024-09-14 14:22:44 +0800
• 091dd75247 线上sql报错修改 liang.chao 2024-09-14 11:14:19 +0800
• da26589e8d 线上sql报错修改 liang.chao 2024-09-14 10:41:59 +0800
• ffdbcd019e Merge remote-tracking branch 'origin/dev-nx' into dev-nx liang.chao 2024-09-13 14:35:43 +0800
• 1d35c72d4b Merge remote-tracking branch 'origin/dev-nx' into dev-nx liang.chao 2024-09-13 14:30:13 +0800
• d8dead113a 重庆结算驳回功能开发 liang.chao 2024-09-13 14:30:06 +0800
• 11362d1f0b 审核驳回功能 wcy 2024-09-13 14:29:58 +0800
• bc382854f1 代码优化 BianLzhaoMin 2024-09-12 13:55:08 +0800
• ad676e57dc 打包配置优化 BianLzhaoMin 2024-09-12 11:50:05 +0800
• ad70d31465 修改打包配置 为后续ng重新配置作准备 BianLzhaoMin 2024-09-12 10:19:26 +0800
• 43aa148f9d 代码优化 BianLzhaoMin 2024-09-12 10:05:49 +0800
• 3135a41ec2 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-09-12 09:53:03 +0800
• 9ee0268138 页面样式调整 BianLzhaoMin 2024-09-12 09:53:00 +0800
• 3a1d073a68 生产问题提交 liang.chao 2024-09-11 11:19:35 +0800
• e43f8d4915 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-09-09 14:44:39 +0800
• 4af2fdeefe 代码优化 BianLzhaoMin 2024-09-09 14:44:36 +0800
• 32045be221 生产环境配置文件新增 liang.chao 2024-09-09 13:02:54 +0800
• 4d7feb8ea3 字典表更新 liang.chao 2024-09-06 16:15:24 +0800
• 9811e4bc1e 大屏二级页面模糊查询 liang.chao 2024-09-05 18:26:00 +0800
• 35e264680c 测试bug提交 liang.chao 2024-09-05 16:54:22 +0800
• 8cc289e502 标段工程省份字段未更新 liang.chao 2024-09-04 13:55:32 +0800
• fcfc31bb91 库管员 dev-nwcc mashuai 2024-09-04 09:15:08 +0800
• f97ccbc0bc Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-08-27 18:09:36 +0800
• 1eab23e306 绑定编码问题优化 BianLzhaoMin 2024-08-27 18:09:30 +0800
• 1969c65c6c Revert "退料接收时,检查结算表拿到待退料数量,防止多退" sxu 2024-08-27 18:00:18 +0800
• 72d67f1b66 退料接收时,检查结算表拿到待退料数量,防止多退 sxu 2024-08-27 17:21:42 +0800
• d472a43641 Revert "退料接收时,检查结算表拿到待退料数量,防止多退" sxu 2024-08-27 16:27:29 +0800
• 20dd458628 去掉排序 sxu 2024-08-27 16:02:25 +0800
• 76a98b70ea 退料接收时,检查结算表拿到待退料数量,防止多退 sxu 2024-08-27 16:00:59 +0800
• 73ca957a7c Merge remote-tracking branch 'origin/dev-nx' into dev-nx liang.chao 2024-08-27 15:54:01 +0800
• 75fdd15182 设备停留点增加经纬度 liang.chao 2024-08-27 15:53:56 +0800
• 212095bea9 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-08-27 15:16:20 +0800
• 74dec8db3a iot行程问题完善 BianLzhaoMin 2024-08-27 15:16:13 +0800
• 20ead6e3a6 编码设备库存查询修改 liang.chao 2024-08-27 10:23:37 +0800
• 51452ce3a3 Merge remote-tracking branch 'origin/dev-nx' into dev-nx liang.chao 2024-08-27 09:40:40 +0800
• 4c08156676 增加省份后地址字段 liang.chao 2024-08-27 09:40:23 +0800
• 99627bab6f 标段工程新增时优化 BianLzhaoMin 2024-08-27 09:35:54 +0800
• 9797d3d1ba 代码优化 BianLzhaoMin 2024-08-27 09:24:59 +0800
• 67eb5113e6 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-08-26 21:27:48 +0800
• 893706ad26 代码优化 BianLzhaoMin 2024-08-26 21:27:42 +0800
• 2e00a1ffaa Merge remote-tracking branch 'origin/dev-nx' into dev-nx liang.chao 2024-08-26 21:19:41 +0800
• 406f402c9c 无用字段删除 liang.chao 2024-08-26 21:19:31 +0800
• 64c9f2cad6 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-08-26 20:53:39 +0800
• 917829ce1b 大屏功能完善 BianLzhaoMin 2024-08-26 20:53:34 +0800
• 1ee2760a7c 配置文件修改 liang.chao 2024-08-26 20:27:17 +0800
• eb09e27ab5 Merge remote-tracking branch 'origin/dev-nx' into dev-nx liang.chao 2024-08-26 20:25:45 +0800
• 6de2c8b5c3 大屏二级页面接口增加 liang.chao 2024-08-26 20:25:38 +0800
• baef8909bf Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-08-23 08:54:58 +0800
• b62d692d3e 代码优化 BianLzhaoMin 2024-08-23 08:54:51 +0800
• 0bfae9191a iot设备code字符问题修改 liang.chao 2024-08-22 11:04:07 +0800
• 4f2454d7dd iot设备code字符问题修改 liang.chao 2024-08-22 11:01:08 +0800
• 52f40b3acd 角色表查询sql修改 liang.chao 2024-08-21 16:46:40 +0800
• 82cd7e1cca 本地配置文件修改 liang.chao 2024-08-21 14:34:05 +0800
• 4d3673b337 Merge remote-tracking branch 'origin/dev-nx' into dev-nx liang.chao 2024-08-21 14:14:25 +0800
• 5311cb0c5c Merge branch 'macode20240820' into dev-nx liang.chao 2024-08-21 14:13:58 +0800
• 5aa904aa95 remark 2 scripts sxu 2024-08-21 14:11:30 +0800
• f9488d54fd 合并profile改动 sxu 2024-08-21 14:01:52 +0800
• 84cf4c6d4d profile dev-nx-sx20240821b sxu 2024-08-21 11:26:16 +0800
• 7ba0e27fae profile sxu 2024-08-21 11:25:03 +0800
• 31cb544525 profile sxu 2024-08-21 11:23:47 +0800
• e58839bd95 profile sxu 2024-08-21 11:20:59 +0800
• 0a01e46d18 machine库存查询修改 macode20240820 liang.chao 2024-08-21 11:20:27 +0800
• f596dac1bf profile sxu 2024-08-21 11:19:27 +0800
• 315f293cd1 profile sxu 2024-08-21 11:16:40 +0800
• 25b4cad47e 合并重复提交改动 sxu 2024-08-21 11:09:06 +0800
• fb065fae37 防重复提交 dev-nx-sx20240821 sxu 2024-08-21 11:06:32 +0800
• 8b7cd8b3e2 防重复提交 sxu 2024-08-21 11:05:04 +0800
• 39c085aa48 防重复提交 sxu 2024-08-21 10:58:14 +0800
• 2edf5af00b machine库存查询修改 liang.chao 2024-08-20 14:09:48 +0800
• a0affba5ae 防重复提交 sxu 2024-08-19 18:55:50 +0800
• 8638358fa1 大屏定位信息代码提交 liang.chao 2024-08-19 17:59:40 +0800
• 90210e0ac4 大屏定位信息代码提交 liang.chao 2024-08-19 17:49:56 +0800
• d6434ff805 代码优化 BianLzhaoMin 2024-08-16 13:37:50 +0800
• f3312f4970 结算金额处略微调整 BianLzhaoMin 2024-08-15 09:34:06 +0800
• 2ed34bec99 费用结算页面优化 BianLzhaoMin 2024-08-14 17:07:38 +0800
• 6d7a3e9f10 结算页面费用调整 BianLzhaoMin 2024-08-14 15:10:35 +0800
• 13ca08d4a3 结算费用模块调整 BianLzhaoMin 2024-08-14 14:52:39 +0800
• f97b175f57 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-08-13 18:11:12 +0800
• 31e9acfbbf 页面优化 BianLzhaoMin 2024-08-13 18:11:07 +0800
• fbf124d1d4 标段工程修改增加字段 liang.chao 2024-08-13 18:09:17 +0800
• 738f842a30 禅道bug修改，周计划任务提交 liang.chao 2024-08-13 17:45:27 +0800
• 1a1ad07c53 iot定位设备页面优化 BianLzhaoMin 2024-08-13 15:35:26 +0800
• fe500aee26 deploy sxu 2024-08-13 08:41:34 +0800
• 1ce45bf5eb 代码隐藏 dev-nw BianLzhaoMin 2024-08-12 13:22:31 +0800
• 9ab2c14351 代码优化 BianLzhaoMin 2024-08-12 13:15:07 +0800
• 825c4abb8b nx2.0 sxu 2024-08-12 11:27:27 +0800
• 0bf660faf3 IOT设备 76164 2024-08-12 10:52:51 +0800
• a613e872ff 代码优化 BianLzhaoMin 2024-08-09 17:15:06 +0800
• 04137f7203 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 76164 2024-08-09 17:11:42 +0800
• 0c15f6917e IOT设备 76164 2024-08-09 17:11:19 +0800
• c94bffb217 代码优化 BianLzhaoMin 2024-08-09 17:07:44 +0800