Commit Graph

  • 17f31863f9 1 gtz 2024-03-01 11:52:42 +08:00
  • 4f14b32a83 Merge pull request 'projects/mesxc-lb' (#224) from projects/mesxc-lb into projects/mesxc-test 高天泽 2024-03-01 11:21:10 +08:00
  • f378347063 Merge branch 'projects/mesxc-test' into projects/mesxc-lb lb 2024-03-01 11:20:00 +08:00
  • 6452b6a12c Merge pull request '3,1' (#223) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-03-01 11:17:41 +08:00
  • 151df54032 3,1 juzi 2024-03-01 11:17:11 +08:00
  • 4c41d6fad9 bugfix lb 2024-03-01 11:16:53 +08:00
  • 9beca01fef Merge pull request 'projects/mesxc-lb' (#222) from projects/mesxc-lb into projects/mesxc-test juzi 2024-02-29 17:04:19 +08:00
  • c66e82b152 Merge branch 'projects/mesxc-test' into projects/mesxc-lb lb 2024-02-29 17:02:08 +08:00
  • 38668fca09 bugfix 设备保养 lb 2024-02-29 17:01:35 +08:00
  • 20bf8c27f0 Merge pull request 'projects/mesxc-zjl' (#221) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-02-29 16:53:00 +08:00
  • afe28d103e 1 juzi 2024-02-29 16:52:30 +08:00
  • 889f4472e6 bugfix equipmentRepair lb 2024-02-29 16:49:54 +08:00
  • 606a23f10d merge test juzi 2024-02-29 16:47:54 +08:00
  • 5deaa0bc1e 修改bug juzi 2024-02-29 16:46:25 +08:00
  • 933a4e45a6 Merge pull request 'projects/mesxc-dy' (#220) from projects/mesxc-dy into projects/mesxc-test juzi 2024-02-29 16:45:58 +08:00
  • 7c8c584837 Merge branch 'projects/mesxc-test' into projects/mesxc-dy helloDy 2024-02-29 15:55:12 +08:00
  • 838c8d66ad 1 lb 2024-02-29 15:54:49 +08:00
  • 93eb12aeb7 bugs helloDy 2024-02-29 15:54:23 +08:00
  • a41db38229 update 群里反馈的 lb 2024-02-29 14:07:18 +08:00
  • a822ffe138 Merge pull request '订单状态对于按钮操作确认修改' (#219) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-02-29 09:21:07 +08:00
  • d750cbe0f8 订单状态对于按钮操作确认修改 juzi 2024-02-29 09:20:34 +08:00
  • 1318e96d0d Merge pull request 'projects/mesxc-zjl' (#218) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-02-28 17:03:31 +08:00
  • 4174feab9e merge test juzi 2024-02-28 17:03:06 +08:00
  • e0aa0b7052 Merge pull request 'projects/mesxc-dy' (#217) from projects/mesxc-dy into projects/mesxc-test juzi 2024-02-28 16:57:00 +08:00
  • ce1971727a 集团订单 juzi 2024-02-28 16:56:47 +08:00
  • f8d033c97a Merge branch 'projects/mesxc-test' into projects/mesxc-dy helloDy 2024-02-28 16:15:16 +08:00
  • ecb447c052 巡检 helloDy 2024-02-28 16:14:41 +08:00
  • dd6f07a9b0 Merge pull request 'projects/mesxc-dy' (#216) from projects/mesxc-dy into projects/mesxc-test juzi 2024-02-28 15:09:46 +08:00
  • 0ba8d3bff8 Merge branch 'projects/mesxc-test' into projects/mesxc-dy helloDy 2024-02-28 15:04:29 +08:00
  • 1a622dc4d3 待确认 helloDy 2024-02-28 15:03:21 +08:00
  • 2fe3aebe89 Merge pull request 'projects/mesxc-zhp' (#215) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-02-28 11:23:36 +08:00
  • bf90cc453d Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-02-28 10:55:19 +08:00
  • afd6e68d9b 修改bug ‘937886381’ 2024-02-28 10:54:44 +08:00
  • c71d99a21e Merge branch 'projects/mesxc-test' into projects/mesxc-dy helloDy 2024-02-28 09:29:10 +08:00
  • dbbccc7d72 bug helloDy 2024-02-28 09:28:34 +08:00
  • ac162415c5 Merge pull request 'projects/mesxc-lb' (#214) from projects/mesxc-lb into projects/mesxc-test juzi 2024-02-28 09:09:13 +08:00
  • 2c87e3f3b8 Merge branch 'projects/mesxc-test' into projects/mesxc-lb lb 2024-02-28 09:05:42 +08:00
  • 529596b923 update 保养记录待确认 lb 2024-02-27 17:08:15 +08:00
  • 2a7bfa2562 Merge pull request 'projects/mesxc-dy' (#213) from projects/mesxc-dy into projects/mesxc-test juzi 2024-02-27 16:42:26 +08:00
  • 520c31a9e1 Merge branch 'projects/mesxc-test' into projects/mesxc-dy helloDy 2024-02-27 16:40:13 +08:00
  • 8e1a1848fb bug helloDy 2024-02-27 16:39:39 +08:00
  • a00edd8938 Merge pull request 'projects/mesxc-lb' (#212) from projects/mesxc-lb into projects/mesxc-test juzi 2024-02-27 16:36:49 +08:00
  • 71d1986671 Merge branch 'projects/mesxc-test' into projects/mesxc-lb lb 2024-02-27 16:15:37 +08:00
  • 7287a1f6fa update lb 2024-02-27 16:13:54 +08:00
  • 38911a29d2 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-02-27 16:12:49 +08:00
  • 6490fe3f45 修改 ‘937886381’ 2024-02-27 16:12:21 +08:00
  • 8abe75a9b9 update待确认巡检单 lb 2024-02-27 15:55:52 +08:00
  • 44dc55d69f Merge pull request 'projects/mesxc-dy' (#211) from projects/mesxc-dy into projects/mesxc-test juzi 2024-02-27 09:27:20 +08:00
  • 85791cc10c Merge branch 'projects/mesxc-test' into projects/mesxc-dy helloDy 2024-02-27 09:23:00 +08:00
  • ef740fec27 设备保养设备巡检 helloDy 2024-02-27 09:22:03 +08:00
  • 5c251e6a25 Merge pull request 'projects/mesxc-zjl' (#210) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-02-27 09:14:48 +08:00
  • a8013fce87 merge test juzi 2024-02-27 09:14:10 +08:00
  • 65e2f9ed6a 订单bug修改 juzi 2024-02-27 09:12:17 +08:00
  • ad3a2cb1ae Merge pull request 'projects/mesxc-lb' (#209) from projects/mesxc-lb into projects/mesxc-test juzi 2024-02-27 09:11:12 +08:00
  • 6d3b41a394 Merge branch 'projects/mesxc-test' into projects/mesxc-lb lb 2024-02-26 17:06:19 +08:00
  • 007cf5e638 Merge pull request '订单bug' (#208) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-02-26 13:19:19 +08:00
  • 3e89f4066f 订单bug juzi 2024-02-26 13:18:21 +08:00
  • 2c12a26e64 Merge pull request 'projects/mesxc-zjl' (#207) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-02-26 10:46:26 +08:00
  • c5925e54cd merge test juzi 2024-02-26 10:45:48 +08:00
  • af426f4bf8 Merge pull request 'projects/mesxc-dy' (#206) from projects/mesxc-dy into projects/mesxc-test juzi 2024-02-26 10:44:07 +08:00
  • 512986faf6 fix navbar right lb 2024-02-26 10:28:16 +08:00
  • b08639f15c merge test juzi 2024-02-26 10:19:35 +08:00
  • 9a807ff798 能源bug修改 juzi 2024-02-26 10:15:56 +08:00
  • 7da93bbca0 merge helloDy 2024-02-26 08:46:18 +08:00
  • 0abf628377 设备 helloDy 2024-02-26 08:44:42 +08:00
  • e78a5e1b85 Merge pull request 'projects/mesxc-lb' (#205) from projects/mesxc-lb into projects/mesxc-test 高天泽 2024-02-26 02:14:06 +08:00
  • 35da704bb4 设备保养 helloDy 2024-02-24 19:18:11 +08:00
  • 2997f4b7b9 Merge branch 'projects/mesxc-test' into projects/mesxc-lb lb 2024-02-23 17:15:56 +08:00
  • 4316e7f37f merge & delete yarn.lock lb 2024-02-23 17:14:28 +08:00
  • 38bb5a31e7 Merge pull request 'projects/mesxc-zjl' (#204) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-02-23 17:13:39 +08:00
  • 842b863561 merge test juzi 2024-02-23 17:11:24 +08:00
  • 89e86c31bb update 巡检记录 lb 2024-02-23 17:03:55 +08:00
  • 71fc98b0bb 订单管理 juzi 2024-02-23 17:01:48 +08:00
  • 15738642b0 update lb 2024-02-23 16:32:01 +08:00
  • 2c88d442f2 Merge pull request 'projects/mesxc-zhp' (#203) from projects/mesxc-zhp into projects/mesxc-test 高天泽 2024-02-23 16:14:40 +08:00
  • 8dccbdbeb7 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-02-23 16:13:11 +08:00
  • 81c1f2c571 xiugaibug ‘937886381’ 2024-02-23 16:12:43 +08:00
  • 5dd551c795 Merge pull request 'projects/mesxc-zhp' (#202) from projects/mesxc-zhp into projects/mesxc-test 高天泽 2024-02-23 16:09:54 +08:00
  • a6f7bb2f2d 解决冲突 ‘937886381’ 2024-02-23 16:04:05 +08:00
  • 05b513a862 修改 ‘937886381’ 2024-02-23 16:02:55 +08:00
  • f72cd9d68e update 待确认 lb 2024-02-23 15:11:36 +08:00
  • 99b225e3dc update 巡检待确认 lb 2024-02-23 11:20:04 +08:00
  • 4d1b72fae7 update 巡检待确认 lb 2024-02-23 09:45:43 +08:00
  • 67a76869e1 update 巡检单待确认 lb 2024-02-22 16:52:07 +08:00
  • ca2774ca28 update navbar user dept lb 2024-02-22 16:23:19 +08:00
  • 1dd7fef171 update 巡检待确认 lb 2024-02-22 16:19:02 +08:00
  • 9ad83f84fa update 巡检单设置 lb 2024-02-22 16:11:30 +08:00
  • ef354732b4 update 巡检单设置 lb 2024-02-22 11:21:59 +08:00
  • 478baaabd4 Merge pull request 'projects/mesxc-dy' (#201) from projects/mesxc-dy into projects/mesxc-test 高天泽 2024-02-22 09:31:30 +08:00
  • ff19047729 merge helloDy 2024-02-21 18:47:46 +08:00
  • ea7c419c6f 基础核心,设备基础 helloDy 2024-02-21 18:39:48 +08:00
  • 95a4b336f8 update lb 2024-02-21 16:55:35 +08:00
  • ed65bd7f30 update check record lb 2024-02-21 16:39:43 +08:00
  • fd03fdf046 Merge pull request 'projects/mesxc-zhp' (#200) from projects/mesxc-zhp into projects/mesxc-test 高天泽 2024-02-21 16:09:58 +08:00
  • 5b40c3972c update repair detail lb 2024-02-21 15:35:12 +08:00
  • d3b87e4051 解决冲突 ‘937886381’ 2024-02-21 15:28:15 +08:00
  • 03ee5e1037 修改bug ‘937886381’ 2024-02-21 15:27:09 +08:00
  • f8c2889abc update repair lb 2024-02-21 14:44:15 +08:00
  • eb0445f479 update 特种设备维修 lb 2024-02-20 17:00:56 +08:00
  • 9f8d604456 done 保养模块 lb 2024-02-20 15:53:31 +08:00