Commit Graph

  • b89f510e61 Merge pull request '1' (#362) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-25 09:13:09 +0800
  • 0e60f426bc Merge branch 'projects/mesxc-test' into projects/mesxc-dy helloDy 2024-04-25 09:11:00 +0800
  • 21f4879394 date helloDy 2024-04-25 09:10:28 +0800
  • 067cd4765e 1 juzi 2024-04-25 09:04:29 +0800
  • 3c4fe6daaa Merge pull request 'projects/mesxc-dy' (#361) from projects/mesxc-dy into projects/mesxc-test juzi 2024-04-25 08:42:57 +0800
  • e24f9c1079 Merge branch 'projects/mesxc-test' into projects/mesxc-dy helloDy 2024-04-25 08:40:38 +0800
  • 61567ce86a 生产数据汇总 helloDy 2024-04-25 08:40:08 +0800
  • 2ee66714ca Merge pull request '修改' (#360) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-24 17:06:02 +0800
  • ab5867c4fd 修改 juzi 2024-04-24 17:05:19 +0800
  • 9a53391999 👷 添加自动构建发布配置 shr 2024-04-24 15:58:53 +0800
  • 95b59561c2 👷 添加自动构建发布配置 shr 2024-04-24 15:58:53 +0800
  • ec0c09a674 Merge pull request 'projects/mesxc-zhp' (#358) from projects/mesxc-zhp into projects/mesxc-test projects/mesxc-dev juzi 2024-04-24 14:54:40 +0800
  • 90e9b179eb Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-24 14:52:32 +0800
  • 8e2b332c7b 修改bug ‘937886381’ 2024-04-24 14:52:01 +0800
  • f37a12d2e1 Merge pull request '修改bug' (#357) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-24 14:38:13 +0800
  • cb19872012 Merge pull request 'projects/mesxc-zhp' (#356) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-24 14:37:05 +0800
  • 8ba79185d4 修改bug ‘937886381’ 2024-04-24 14:36:45 +0800
  • 104cda5a41 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-24 14:34:08 +0800
  • 151c5708c4 修改bug ‘937886381’ 2024-04-24 14:33:46 +0800
  • 837735b7e8 Merge pull request 'projects/mesxc-zhp' (#355) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-24 14:25:03 +0800
  • e00a08385f Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-24 14:23:47 +0800
  • a8c3d2c585 修改bug ‘937886381’ 2024-04-24 14:23:13 +0800
  • eb097e77bd Merge pull request 'projects/mesxc-zhp' (#354) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-24 13:50:44 +0800
  • 30eecb8bd1 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-24 13:49:44 +0800
  • f4a6229170 修改bug ‘937886381’ 2024-04-24 13:49:23 +0800
  • ab593bff20 Merge pull request 'projects/mesxc-zjl' (#353) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-24 13:32:26 +0800
  • 4b01dd3ec3 merge test juzi 2024-04-24 13:31:55 +0800
  • ed3ea7dde8 Merge pull request 'projects/mesxc-dy' (#352) from projects/mesxc-dy into projects/mesxc-test juzi 2024-04-24 13:30:39 +0800
  • 1d9e272f99 驾驶舱 juzi 2024-04-24 13:30:06 +0800
  • 43c9153777 冲突 helloDy 2024-04-23 17:25:39 +0800
  • c6d504583b 生产数据汇总表 helloDy 2024-04-23 17:23:54 +0800
  • 22f3c87f02 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-23 16:47:49 +0800
  • 1f54c9179d 修改bug ‘937886381’ 2024-04-23 16:47:27 +0800
  • f7247f5161 Merge pull request 'projects/mesxc-zhp' (#351) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-23 16:28:30 +0800
  • c8856f34b5 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-23 16:19:23 +0800
  • 42c42abc08 新增报表 ‘937886381’ 2024-04-23 16:19:01 +0800
  • 0fffed9b0e Merge pull request 'projects/mesxc-zhp' (#350) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-23 15:26:03 +0800
  • d251daa3f5 修改bug ‘937886381’ 2024-04-23 15:23:43 +0800
  • ed5120ca97 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-23 15:09:42 +0800
  • becf34d089 修改bug ‘937886381’ 2024-04-23 15:09:07 +0800
  • f0d64de77b Merge pull request 'projects/mesxc-zjl' (#349) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-23 14:44:04 +0800
  • 56819176b3 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-23 14:43:32 +0800
  • d302179f6f Merge pull request 'projects/mesxc-zhp' (#348) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-23 14:42:19 +0800
  • 8c117fae8e 报表 juzi 2024-04-23 14:42:02 +0800
  • b6cf7b2ddc 剞劂冲突 ‘937886381’ 2024-04-23 13:53:33 +0800
  • 2f98b42bd2 新增报表 ‘937886381’ 2024-04-23 13:52:10 +0800
  • fb8ae9226a Merge pull request 'projects/mesxc-zjl' (#347) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-23 09:13:51 +0800
  • 3d3763c4ef merge test juzi 2024-04-23 09:13:29 +0800
  • ea675b9dea Merge pull request 'projects/mesxc-zhp' (#346) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-23 09:11:45 +0800
  • bda065e4be 报表 juzi 2024-04-23 09:11:14 +0800
  • 5ea4c219ed 新增报表 ‘937886381’ 2024-04-22 17:14:59 +0800
  • 09cce6c613 Merge pull request '更新自贡' (#345) from projects/zg-zwq into projects/zg-test 朱文强 2024-04-22 16:56:43 +0800
  • 07dd135daa 更新自贡 zwq 2024-04-22 16:55:59 +0800
  • 16186667da merge helloDy 2024-04-22 15:20:56 +0800
  • c7cd6e7b1e 部门换接口 helloDy 2024-04-22 15:19:35 +0800
  • 29c3a9fb72 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-22 08:55:20 +0800
  • 1e1313d090 修改bug ‘937886381’ 2024-04-22 08:54:55 +0800
  • d0eb1d84c8 Merge pull request 'projects/mesxc-zhp' (#344) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-19 17:02:23 +0800
  • 445d8f4818 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-19 17:01:17 +0800
  • 46ce982cfc 新增报表 ‘937886381’ 2024-04-19 16:59:47 +0800
  • 391e06a382 Merge pull request 'projects/mesxc-zjl' (#342) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-19 11:11:19 +0800
  • 72e1b4e8f9 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-19 11:10:38 +0800
  • b41ba04cb4 Merge pull request 'projects/mesxc-zhp' (#341) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-19 11:09:12 +0800
  • 4482ce0433 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-19 11:07:43 +0800
  • ecf6745c8a 报表新增 ‘937886381’ 2024-04-19 11:07:14 +0800
  • c9128ce946 包装40% juzi 2024-04-19 11:03:50 +0800
  • ba08175de8 Merge pull request 'projects/mesxc-zhp' (#340) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-17 16:36:22 +0800
  • 22f8322baf Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-17 16:16:37 +0800
  • 6f8abc9758 修改ui ‘937886381’ 2024-04-17 16:15:59 +0800
  • 59d53b60c7 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-17 13:23:20 +0800
  • d448280782 test juzi 2024-04-16 15:29:39 +0800
  • 0337b54202 Merge pull request 'projects/mesxc-zhp' (#339) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-16 14:07:17 +0800
  • 9dec81e0b2 修改ui ‘937886381’ 2024-04-16 14:04:43 +0800
  • 64de2c50b6 修改bug ‘937886381’ 2024-04-16 13:52:38 +0800
  • bd0f9e24fd Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-16 13:46:08 +0800
  • f3043ee11f 修改ui ‘937886381’ 2024-04-16 13:45:38 +0800
  • 0757d2d47c Merge pull request '更新' (#338) from projects/zg-zwq into projects/zg-test 朱文强 2024-04-15 17:22:40 +0800
  • 4fbe72d314 更新 zwq 2024-04-15 17:22:10 +0800
  • 5584a47575 Merge pull request 'projects/mesxc-zjl' (#337) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-15 14:59:29 +0800
  • b0078cb099 1 juzi 2024-04-15 14:49:28 +0800
  • e5acd497b5 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-15 09:35:46 +0800
  • 6b452dce36 能源bug juzi 2024-04-15 09:35:00 +0800
  • aacf87f6d3 Merge pull request 'projects/mesxc-zhp' (#336) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-15 09:31:35 +0800
  • bfa17e422d Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-15 09:29:29 +0800
  • e25f872589 修改ui ‘937886381’ 2024-04-15 09:28:49 +0800
  • 83b834d2fc Merge pull request 'projects/mesxc-zjl' (#335) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-12 17:02:46 +0800
  • 1b2c16fcdb Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-12 17:01:59 +0800
  • 475ec35ec5 1 juzi 2024-04-12 16:59:34 +0800
  • 1328da9616 Merge pull request 'projects/mesxc-lb' (#334) from projects/mesxc-lb into projects/mesxc-test juzi 2024-04-12 16:50:11 +0800
  • 92b9ec7da7 Merge branch 'projects/mesxc-test' into projects/mesxc-lb lb 2024-04-12 16:46:20 +0800
  • c1af47db81 Merge pull request 'projects/mesxc-zhp' (#333) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-12 16:44:38 +0800
  • 15afbcd612 bugfix 特殊设备权限 lb 2024-04-12 16:40:15 +0800
  • dabbc6b63a 修改bug ‘937886381’ 2024-04-12 15:27:01 +0800
  • cfab3353d3 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-12 15:18:43 +0800
  • 2298fc56b6 修改bug ‘937886381’ 2024-04-12 15:17:21 +0800
  • bb77d0f8c6 Merge pull request 'projects/mesxc-zhp' (#332) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-12 14:58:10 +0800
  • e8938a62eb 解决冲突 ‘937886381’ 2024-04-12 14:31:56 +0800
  • 2a599d96b3 修改bug ‘937886381’ 2024-04-12 14:30:11 +0800
  • 6050eb4df5 修改bug ‘937886381’ 2024-04-12 14:27:51 +0800
  • 02c3b3db0d Merge branch 'projects/mesxc-test' into projects/mesxc-lb lb 2024-04-12 13:53:50 +0800