commit 8ae737ce0b39dd57739a12e5b739023cc77286fb (HEAD -> master) Merge: 922fd190 66291818 Author: xiaojiazheng <2162621686@qq.com> Date: Wed Dec 13 17:09:07 2023 +0800 Merge branch 'master' of https://gitee.com/syssys001/wuliaoguanli commit 922fd190e389886b6b7034388101a0e523828941 Author: xiaojiazheng <2162621686@qq.com> Date: Wed Dec 13 17:09:04 2023 +0800 加合计 commit 66291818dff8e9f2b754638b3baf1609dd34b824 Author: PushBug <3274773833@qq.com> Date: Wed Dec 13 17:07:27 2023 +0800 fix:大屏 commit 704e43a5d5786e224d997076a5a267b22accaddb Merge: a4173774 d559e07d Author: xuy Date: Wed Dec 13 17:01:41 2023 +0800 Merge branch 'master' of gitee.com:shexinxinphp/wuliaoguanli commit a417377422c1acf72c6ff9962231324f858510dd Author: xuy Date: Wed Dec 13 17:01:39 2023 +0800 fix登录 commit d559e07dd69b1242038f913d7536d5500ce77e83 Author: PushBug <3274773833@qq.com> Date: Wed Dec 13 16:56:20 2023 +0800 fix:历史材料出库总价>历史材料入库总价 标红 commit 3446919be7c14f6c16d9827f9afd86de0bb3e6c6 Merge: ce4e7a06 3b919a32 Author: xiaojiazheng <2162621686@qq.com> Date: Wed Dec 13 16:54:15 2023 +0800 Merge branch 'master' of https://gitee.com/syssys001/wuliaoguanli commit ce4e7a06f68ee7a089e0e04385f52db63a628c17 Author: xiaojiazheng <2162621686@qq.com> Date: Wed Dec 13 16:54:12 2023 +0800 bug加新功能 commit 3b919a329b7bc7aa8e05fc922b7ced8323fbcf3d Author: PushBug <3274773833@qq.com> Date: Wed Dec 13 16:36:23 2023 +0800 fix:历史材料出库总价>历史材料入库总价 标红 commit 5f93c6b6d29fb2e0278dbb1499de99a0d70a7b5e Author: PushBug <3274773833@qq.com> Date: Wed Dec 13 16:33:47 2023 +0800 fix:历史 commit 42666e5b986ac1c7cce4e8ac105b0b93e5a5c22b Merge: 352e1ce3 3dd8f1cf Author: bozai9 <2690305786@qq.com> Date: Wed Dec 13 16:30:07 2023 +0800 Merge branch 'master' of https://gitee.com/syssys001/wuliaoguanli commit 352e1ce30b4522860a3a59f0728ab24dee79bf1f Author: bozai9 <2690305786@qq.com> Date: Wed Dec 13 16:29:53 2023 +0800 fix: 收发料详情数字约束 commit 3dd8f1cfee6932c6626efa150ac1d2ef1e82907b Author: PushBug <3274773833@qq.com> Date: Wed Dec 13 16:28:39 2023 +0800 fix:大屏 commit 3702ee5627f37d6dacf7e62c2ec97713ddd917d6 Author: PushBug <3274773833@qq.com> Date: Wed Dec 13 16:20:05 2023 +0800 fix:大屏 commit baed4544db56c4154b9f76bf0374dda23a773640 Author: PushBug <3274773833@qq.com> Date: Wed Dec 13 16:19:42 2023 +0800 fix:大屏 commit af2f2526f550c1a5ad4458604e0dad98756d2c17 Author: PushBug <3274773833@qq.com> Date: Wed Dec 13 16:13:06 2023 +0800 fix:磅站 commit 30b6c1d8a7196b8d5bc2dc810a8c06d6cff7941d Author: 1632255469@qq.com <1632255469@qq.com> Date: Wed Dec 13 15:39:32 2023 +0800 新增无申请预警 commit 97e2575c7736f14e39172985666f29e018479246 Merge: 3cb15dcc de8ad725 Author: bozai9 <2690305786@qq.com> Date: Wed Dec 13 14:48:45 2023 +0800 Merge branch 'master' of https://gitee.com/syssys001/wuliaoguanli commit 3cb15dcc3ed91632abe6151692bfd01f69a27ee1 Author: bozai9 <2690305786@qq.com> Date: Wed Dec 13 14:48:32 2023 +0800 fix: 收发料详情数字约束 commit de8ad72575601ec4919e3d2d5d6d13f107ea7c55 Author: PushBug <3274773833@qq.com> Date: Wed Dec 13 14:26:05 2023 +0800 fix:磅站 commit 78f32325609a8c57cb33587aad5ab6ad71e95d8f Merge: aff46123 d214f8f9 Author: bozai9 <2690305786@qq.com> Date: Wed Dec 13 14:21:09 2023 +0800 Merge branch 'master' of https://gitee.com/syssys001/wuliaoguanli commit aff46123d446d71b2bce2b62854e2b954c685842 Author: bozai9 <2690305786@qq.com> Date: Wed Dec 13 14:20:57 2023 +0800 fix: 质量员大屏icon commit d214f8f93a0a2aa2f7aa87f8617661ba8ad01879 Author: PushBug <3274773833@qq.com> Date: Wed Dec 13 14:19:46 2023 +0800 fix:磅站 commit 5059a03d98488b9c1bb4960b703ceb60e16c7128 Author: bozai9 <2690305786@qq.com> Date: Wed Dec 13 14:19:59 2023 +0800 fix: 质量员大屏icon commit 1f1be401d5edecdbb3290cdb74d59851ed130383 Author: bozai9 <2690305786@qq.com> Date: Wed Dec 13 14:14:26 2023 +0800 fix: 大屏icon commit 14b783e1bdf22acff58bdb9d23dd6acf850fdb0a Author: bozai9 <2690305786@qq.com> Date: Wed Dec 13 14:13:08 2023 +0800 fix: 大屏icon commit 79b4fb29426aa1b371e50c6a147226375f3661f9 Merge: 717143e6 e2bcdecc Author: bozai9 <2690305786@qq.com> Date: Wed Dec 13 14:11:40 2023 +0800 Merge branch 'master' of https://gitee.com/syssys001/wuliaoguanli commit 717143e6313693b6db3a3a94522d1a373338723b Author: bozai9 <2690305786@qq.com> Date: Wed Dec 13 14:11:24 2023 +0800 fix: 收发料卡片 commit e2bcdecc2364486c364342a1878324f430e3a8bd Author: PushBug <3274773833@qq.com> Date: Wed Dec 13 13:45:37 2023 +0800 fix:大屏优化 commit a749a694752195f826a19d9b66e3280a555fb824 Author: PushBug <3274773833@qq.com> Date: Wed Dec 13 13:42:11 2023 +0800 fix:大屏优化 commit 43f5c4770cb2f146a8a6477ad103c4ff11f51738 Author: xiaojiazheng <2162621686@qq.com> Date: Wed Dec 13 12:24:25 2023 +0800 784 commit 6b8297a4154ef968d17c2d5d987052017b147e5f Merge: 1f0234d2 ce6cd68d Author: xiaojiazheng <2162621686@qq.com> Date: Wed Dec 13 12:22:19 2023 +0800 Merge branch 'master' of https://gitee.com/syssys001/wuliaoguanli commit 1f0234d2fa156aa9003655c2b89dcf86c1de00e9 Author: xiaojiazheng <2162621686@qq.com> Date: Wed Dec 13 12:22:16 2023 +0800 okok commit ce6cd68d8b8ff479e317904b54fe38f5d406d161 Author: PushBug <3274773833@qq.com> Date: Wed Dec 13 12:07:33 2023 +0800 fix:钢筋推送接口 commit fff13c8a69cba1f8051badd1aa96c439ccda928c Merge: 7fbbbdc7 3e86076e Author: xuy Date: Wed Dec 13 11:45:35 2023 +0800 Merge branch 'master' of gitee.com:shexinxinphp/wuliaoguanli commit 7fbbbdc728afa3e413bb5ca3635e23d6d8c2de6e Author: xuy Date: Wed Dec 13 11:45:33 2023 +0800 fix:app版本更新 commit 3e86076e4f2e0db8dcca31468f3698810c521f89 Author: 1632255469@qq.com <1632255469@qq.com> Date: Wed Dec 13 11:43:21 2023 +0800 修改合同拉去定时任务 commit 03c491d0134b88cbcb284a95e7880c513c63ee4e Merge: 4f196157 3fe70d7a Author: 1632255469@qq.com <1632255469@qq.com> Date: Wed Dec 13 11:43:05 2023 +0800 Merge remote-tracking branch 'origin/master' commit 4f19615752526d4b10a834067dc1166b38db2fd5 Author: 1632255469@qq.com <1632255469@qq.com> Date: Wed Dec 13 11:42:54 2023 +0800 修改合同拉去定时任务 commit 3fe70d7a0ea1d532b3453822271fb9036b8e4b2b Author: PushBug <3274773833@qq.com> Date: Wed Dec 13 11:39:35 2023 +0800 fix:样式 commit 94c483532b466f23f7752ffc3f477b3838fbc505 Merge: d3eac4c6 39135979 Author: xuy Date: Wed Dec 13 11:37:17 2023 +0800 Merge branch 'master' of gitee.com:shexinxinphp/wuliaoguanli commit d3eac4c6bd5c4e450633374168c9500374217ff7 Author: xuy Date: Wed Dec 13 11:37:13 2023 +0800 fix:材料num 修改 混凝土修改 commit 39135979f56bf2e56fe29b6e5b8a67a1e7656f20 Author: PushBug <3274773833@qq.com> Date: Wed Dec 13 11:20:36 2023 +0800 fix:导入分片 commit c4055f2bb35bf17691ae2edf59dd502c6b60c44d Author: xuy Date: Wed Dec 13 11:05:18 2023 +0800 fix:混凝土 收料报错捕捉 commit 61b8ea24485877968e9fe8ed472766709bff0d52 Author: 1632255469@qq.com <1632255469@qq.com> Date: Wed Dec 13 10:14:15 2023 +0800 修改合同拉去定时任务 commit 1fc6f121b05a001be6cba31ee3e3ad61b43c0c54 Author: 1632255469@qq.com <1632255469@qq.com> Date: Wed Dec 13 09:30:44 2023 +0800 修改合同拉去定时任务 commit cddb21d595b83dcd82357a7d4b4320a571655c