Commit Graph

139 Commits

Author SHA1 Message Date
helloDy
61567ce86a 生产数据汇总 2024-04-25 08:40:08 +08:00
helloDy
43c9153777 冲突 2024-04-23 17:25:39 +08:00
‘937886381’
d251daa3f5 修改bug 2024-04-23 15:23:43 +08:00
‘937886381’
b6cf7b2ddc 剞劂冲突 2024-04-23 13:53:33 +08:00
‘937886381’
2f98b42bd2 新增报表 2024-04-23 13:52:10 +08:00
3d3763c4ef merge test 2024-04-23 09:13:29 +08:00
bda065e4be 报表 2024-04-23 09:11:14 +08:00
‘937886381’
5ea4c219ed 新增报表 2024-04-22 17:14:59 +08:00
helloDy
16186667da merge 2024-04-22 15:20:56 +08:00
helloDy
c7cd6e7b1e 部门换接口 2024-04-22 15:19:35 +08:00
‘937886381’
46ce982cfc 新增报表 2024-04-19 16:59:47 +08:00
‘937886381’
ecf6745c8a 报表新增 2024-04-19 11:07:14 +08:00
‘937886381’
49df8a72bd 修改bug 2024-04-11 16:54:22 +08:00
‘937886381’
e7f440a142 修改bug 2024-04-11 15:26:51 +08:00
‘937886381’
fef8824844 修改bug 2024-04-09 16:05:28 +08:00
7c83268e0c 能源类型 2024-04-03 16:05:27 +08:00
dad71db912 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-04-02 16:55:29 +08:00
94c7f803cc 能源需求修改 2024-04-02 16:54:36 +08:00
gtz
ee828ec4a7 're_infra' 2024-03-28 18:40:27 +08:00
lb
688c541074 merge 2024-03-27 09:14:28 +08:00
helloDy
a409a22bef time 2024-03-26 16:52:04 +08:00
lb
abfd448247 删除+优化特殊设备 2024-03-25 14:37:03 +08:00
helloDy
f1fd854567 merge 2024-03-22 10:29:41 +08:00
helloDy
99fd016703 bug 3 2024-03-22 10:27:57 +08:00
‘937886381’
aa582495de Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-20 15:55:25 +08:00
‘937886381’
6adbdac0a4 修改bug 2024-03-20 15:54:57 +08:00
helloDy
e211e585af Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-03-20 08:48:34 +08:00
helloDy
630e7a95b3 bug 2 2024-03-20 08:48:02 +08:00
‘937886381’
94886eedde 修改bug 2024-03-18 16:00:56 +08:00
73928a0ed0 厂务订单里改个工单接口 2024-03-15 13:33:58 +08:00
helloDy
67948c10cb bug -- 2024-03-14 20:19:42 +08:00
‘937886381’
0457514f1e 修改bug 2024-03-12 11:18:06 +08:00
helloDy
93eb12aeb7 bugs 2024-02-29 15:54:23 +08:00
helloDy
ef740fec27 设备保养设备巡检 2024-02-27 09:22:03 +08:00
helloDy
7da93bbca0 merge 2024-02-26 08:46:18 +08:00
helloDy
0abf628377 设备 2024-02-26 08:44:42 +08:00
helloDy
35da704bb4 设备保养 2024-02-24 19:18:11 +08:00
lb
2997f4b7b9 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-02-23 17:15:56 +08:00
lb
4316e7f37f merge & delete yarn.lock 2024-02-23 17:14:28 +08:00
842b863561 merge test 2024-02-23 17:11:24 +08:00
71fc98b0bb 订单管理 2024-02-23 17:01:48 +08:00
lb
ca2774ca28 update navbar user dept 2024-02-22 16:23:19 +08:00
helloDy
ff19047729 merge 2024-02-21 18:47:46 +08:00
helloDy
ea7c419c6f 基础核心,设备基础 2024-02-21 18:39:48 +08:00
2ee2b2bfc7 订单管理 2024-02-06 14:11:35 +08:00
‘937886381’
009cf3b8e6 合并冲突 2024-02-01 16:49:53 +08:00
‘937886381’
5098555a5e 修改bug 2024-02-01 16:48:58 +08:00
2a504a715f merge test 2024-02-01 14:31:57 +08:00
1bbd9b1e3a 班组 2024-02-01 14:24:12 +08:00
‘937886381’
7ad64c7611 安灯权限管理 2024-01-30 18:08:59 +08:00