Commit Graph

  • 3308fcbef9 Merge pull request 'projects/mesxc-zjl' (#331) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-12 11:21:05 +0800
  • cb7135bad5 merge test juzi 2024-04-12 11:16:15 +0800
  • 4a56f92961 Merge pull request 'projects/mesxc-dy' (#330) from projects/mesxc-dy into projects/mesxc-test juzi 2024-04-12 11:10:01 +0800
  • 8f11c2f47c Merge branch 'projects/mesxc-test' into projects/mesxc-dy helloDy 2024-04-12 11:05:44 +0800
  • b41dc9593c 权限22 helloDy 2024-04-12 11:05:11 +0800
  • 862fe20760 能源bug juzi 2024-04-12 08:56:32 +0800
  • 1ed409a98e Merge pull request 'projects/mesxc-zhp' (#329) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-11 16:55:43 +0800
  • 68e738cf12 Merge pull request 'projects/mesxc-dy' (#328) from projects/mesxc-dy into projects/mesxc-test juzi 2024-04-11 16:55:03 +0800
  • 4866198a98 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-11 16:54:49 +0800
  • 49df8a72bd 修改bug ‘937886381’ 2024-04-11 16:54:22 +0800
  • 087af452de Merge branch 'projects/mesxc-test' into projects/mesxc-dy helloDy 2024-04-11 16:54:02 +0800
  • 63a753d7d6 权限 helloDy 2024-04-11 16:49:48 +0800
  • b1cdf083dd Merge pull request 'projects/mesxc-zjl' (#327) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-11 15:37:55 +0800
  • 673ddcb996 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-11 15:36:54 +0800
  • a9e60dbe82 Merge pull request 'projects/mesxc-zhp' (#326) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-11 15:28:36 +0800
  • 92d197a513 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-11 15:27:11 +0800
  • e7f440a142 修改bug ‘937886381’ 2024-04-11 15:26:51 +0800
  • 5d3622bf62 权限 juzi 2024-04-11 15:22:09 +0800
  • 5ccb9297e1 4.11 juzi 2024-04-11 11:18:08 +0800
  • ce528f18b6 Merge pull request 'projects/mesxc-zhp' (#325) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-11 11:16:10 +0800
  • 024060182e Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-11 11:04:14 +0800
  • 4f111a95d6 修改看板 ‘937886381’ 2024-04-11 11:03:48 +0800
  • 8fc6b73179 Merge pull request 'projects/mesxc-zjl' (#324) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-10 17:39:29 +0800
  • 7f504e5cdd Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-10 17:37:50 +0800
  • 7c5d8bde0b 能源权限 juzi 2024-04-10 17:36:37 +0800
  • 0b1761e83c Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-10 16:52:56 +0800
  • cafa156d72 更改需求 ‘937886381’ 2024-04-10 16:52:18 +0800
  • ed46ed7d09 Merge pull request 'projects/mesxc-zhp' (#323) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-10 16:26:37 +0800
  • f89c6dfe14 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-10 16:12:23 +0800
  • a3b2eae33f 深加工新需求 ‘937886381’ 2024-04-10 16:11:29 +0800
  • e70ff40554 Merge pull request '修改成本新的权限字段' (#322) from projects/mesxc-zwq into projects/mesxc-test 朱文强 2024-04-10 14:49:44 +0800
  • d3d93acd0f 修改成本新的权限字段 projects/mesxc-zwq zwq 2024-04-10 14:48:37 +0800
  • 93236f9828 移除部分监听 juzi 2024-04-10 14:17:30 +0800
  • fef8824844 修改bug ‘937886381’ 2024-04-09 16:05:28 +0800
  • a4fceeb981 Merge pull request 'projects/mesxc-zjl' (#321) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-09 13:09:55 +0800
  • 84468cc883 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-09 13:06:21 +0800
  • ea04d55fc1 驾驶舱 juzi 2024-04-09 13:04:40 +0800
  • ef1078360a Merge pull request '更新成本' (#319) from projects/mesxc-zwq into projects/mesxc-test 朱文强 2024-04-09 11:06:14 +0800
  • 60f6c3a8fe 更新成本 zwq 2024-04-09 11:05:37 +0800
  • a4b340ac5d Merge pull request 'projects/mesxc-dy' (#318) from projects/mesxc-dy into projects/mesxc-test juzi 2024-04-09 08:18:01 +0800
  • 2592551e66 Merge branch 'projects/mesxc-test' into projects/mesxc-dy helloDy 2024-04-08 17:03:21 +0800
  • 1fde96e677 工单bug,改动 helloDy 2024-04-08 17:02:55 +0800
  • 0b16e1fe0d Merge pull request '驾驶舱修改' (#317) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-08 16:39:30 +0800
  • abcec3bcdc Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-08 16:38:59 +0800
  • bdd14eec70 驾驶舱修改 juzi 2024-04-08 16:38:12 +0800
  • 44e7e219a4 Merge pull request 'projects/mesxc-zhp' (#316) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-08 16:37:26 +0800
  • ec51beb8ea Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-08 15:14:37 +0800
  • 433618e71d 修改bug ‘937886381’ 2024-04-08 15:13:52 +0800
  • 812b72f10d Merge pull request 'projects/mesxc-zhp' (#315) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-08 15:11:34 +0800
  • 05f10ab51d Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-08 14:49:46 +0800
  • e7828fd277 修改bug ‘937886381’ 2024-04-08 14:49:20 +0800
  • 58457487d1 Merge pull request 'projects/mesxc-zhp' (#314) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-08 14:09:52 +0800
  • 6c54c223c5 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-08 13:55:56 +0800
  • b2cc509f8e 权限 ‘937886381’ 2024-04-08 13:55:22 +0800
  • b6236e89b1 Merge pull request '1' (#313) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-08 12:26:34 +0800
  • cbc7cbc574 1 juzi 2024-04-08 12:25:44 +0800
  • b5b952e1cc Merge pull request 'projects/mesxc-zjl' (#312) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-08 10:44:09 +0800
  • 33ed9f15fa Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-08 10:42:42 +0800
  • c85c6e4323 能源 juzi 2024-04-08 10:41:43 +0800
  • 30d22b34e1 Merge pull request '成本按钮权限' (#311) from projects/mesxc-zwq into projects/mesxc-test 朱文强 2024-04-08 09:05:52 +0800
  • 3d3fa2ccee 成本按钮权限 zwq 2024-04-08 09:05:10 +0800
  • f960ece594 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-07 16:14:52 +0800
  • 949675b3a2 1 juzi 2024-04-07 16:13:57 +0800
  • f52815abe6 Merge pull request 'projects/mesxc-zhp' (#310) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-07 16:09:32 +0800
  • ac4cea0c7e Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-07 16:07:30 +0800
  • 93fea84c79 修改bug ‘937886381’ 2024-04-07 16:07:04 +0800
  • a06682de3f Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-07 15:41:17 +0800
  • e1773dae03 1 juzi 2024-04-07 15:39:26 +0800
  • f6d866907c Merge pull request 'projects/mesxc-zjl' (#309) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-07 12:19:50 +0800
  • 7fe8d7e72c 能源手动抄表 juzi 2024-04-07 12:18:52 +0800
  • 1e4a33a703 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-07 08:40:39 +0800
  • d1ad913bab Merge pull request 'projects/mesxc-zhp' (#308) from projects/mesxc-zhp into projects/mesxc-test 高天泽 2024-04-03 18:14:55 +0800
  • 38edf00925 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-03 18:13:55 +0800
  • bf231f7157 修改ui ‘937886381’ 2024-04-03 18:13:31 +0800
  • 04e2471a54 Merge pull request 'projects/mesxc-zhp' (#307) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-03 17:37:34 +0800
  • 9e2ce5f636 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-03 17:20:40 +0800
  • 8a54c046d9 修改ui ‘937886381’ 2024-04-03 17:20:14 +0800
  • 3fa702cc12 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-03 16:45:18 +0800
  • 8ebff703ee Merge pull request 'projects/mesxc-zhp' (#306) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-03 16:36:41 +0800
  • 02e267e647 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-03 16:34:39 +0800
  • a6ffba4cf8 修改bug ‘937886381’ 2024-04-03 16:34:15 +0800
  • 3de4d5c5f2 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-03 16:33:32 +0800
  • c6c2d1c3b1 Merge pull request 'projects/mesxc-zhp' (#305) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-03 16:31:31 +0800
  • 1bbd749094 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-03 16:30:35 +0800
  • 073b4b8e20 修改bug ‘937886381’ 2024-04-03 16:30:09 +0800
  • 3ec82a6a41 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-03 16:27:32 +0800
  • 7c83268e0c 能源类型 juzi 2024-04-03 16:05:27 +0800
  • 49cb1e6877 Merge pull request 'projects/mesxc-zhp' (#304) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-03 16:04:07 +0800
  • 481dde003a Merge branch 'projects/mesxc-test' into projects/mesxc-zhp ‘937886381’ 2024-04-03 16:01:37 +0800
  • 43e54e8ee7 修改bug ‘937886381’ 2024-04-03 16:01:11 +0800
  • 28dbe075a4 Merge pull request 'projects/mesxc-dy' (#303) from projects/mesxc-dy into projects/mesxc-test juzi 2024-04-03 15:11:41 +0800
  • 4571786780 merge helloDy 2024-04-03 11:22:32 +0800
  • 21cef13168 table chart helloDy 2024-04-03 11:21:37 +0800
  • 5f5e0ffc69 Merge pull request '1' (#302) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-03 09:02:11 +0800
  • 4d0841bd32 1 juzi 2024-04-03 09:01:43 +0800
  • b6d3b17300 Merge pull request 'projects/mesxc-zjl' (#301) from projects/mesxc-zjl into projects/mesxc-test juzi 2024-04-02 16:56:20 +0800
  • dad71db912 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl juzi 2024-04-02 16:55:29 +0800
  • 94c7f803cc 能源需求修改 juzi 2024-04-02 16:54:36 +0800
  • 0dae8cd16d Merge pull request 'projects/mesxc-zhp' (#300) from projects/mesxc-zhp into projects/mesxc-test juzi 2024-04-02 15:03:51 +0800
  • 1fd547893f 修改bug ‘937886381’ 2024-04-02 15:01:56 +0800