Commit Graph

5277788 update by gtz217 2022-03-14 16:58:27 +0800
127092b Merge pull request '修改bug' (#56) from zwq into develop by 朱文强 2022-03-14 11:00:08 +0800
21d45ad (refs/pull/56/head) 修改bug by zwq 2022-03-14 10:59:13 +0800
3d3c802 Merge pull request 'fzq' (#55) from fzq into develop by 朱文强 2022-03-14 10:56:52 +0800
4263eb7 (refs/pull/55/head) '' by Fanzink 2022-03-13 14:45:13 +0800
7775d15 '' by Fanzink 2022-03-13 14:44:14 +0800
d21c69e Merge pull request 'gtz' (#54) from gtz into develop by 高天泽 2022-03-12 14:25:29 +0800
4921ba6 (refs/pull/54/head) update by gtz217 2022-03-12 14:24:40 +0800
c58d4fb Merge branch 'develop' into test by gtz217 2022-03-12 11:32:21 +0800
f273bd3 Merge pull request '仓库管理-工序库位关联' (#53) from zwq into develop by 朱文强 2022-03-11 16:39:54 +0800
7fd51b5 (refs/pull/53/head) 仓库管理-工序库位关联 by zwq 2022-03-11 16:38:54 +0800
5dda7cd Merge branch 'develop' into gtz by gtz217 2022-03-11 10:37:48 +0800
60fb717 update dashborad number to string by gtz217 2022-03-11 10:37:20 +0800
e7629a6 Merge pull request '修改bug' (#52) from zwq into develop by 朱文强 2022-03-11 09:51:02 +0800
633313c (refs/pull/52/head) 修改bug by zwq 2022-03-11 09:50:41 +0800
7a798d3 Merge pull request '修改bug' (#51) from zwq into develop by 朱文强 2022-03-11 09:20:30 +0800
ddcae6d (refs/pull/51/head) 修改bug by zwq 2022-03-11 09:20:02 +0800
cf1e320 Merge pull request 'fzq' (#50) from fzq into develop by 朱文强 2022-03-11 08:26:17 +0800
44411b1 (refs/pull/50/head) '修改bug' by Fanzink 2022-03-10 21:17:31 +0800
7afe3c3 '修改bug' by Fanzink 2022-03-10 21:15:33 +0800
c5f5647 Merge pull request '修改bug' (#49) from zwq into develop by 朱文强 2022-03-10 16:55:54 +0800
0b6f2ea (refs/pull/49/head) 修改bug by zwq 2022-03-10 16:55:35 +0800
3a8debc Merge pull request 'zwq' (#48) from zwq into develop by 朱文强 2022-03-10 16:50:13 +0800
2876f44 (refs/pull/48/head) 修改bug by zwq 2022-03-10 16:49:41 +0800
6361c3a 修改bug by zwq 2022-03-10 16:45:20 +0800
73ac7e0 Merge pull request '修改bug' (#47) from zwq into develop by 朱文强 2022-03-10 14:31:13 +0800
0adf1da (refs/pull/47/head) 修改bug by zwq 2022-03-10 14:30:33 +0800
77f1831 Merge pull request '修改bug' (#46) from zwq into develop by 朱文强 2022-03-09 16:46:11 +0800
3112915 (refs/pull/46/head) 修改bug by zwq 2022-03-09 16:45:21 +0800
507b9da Merge pull request '更新-仓库-工序' (#45) from zwq into develop by 朱文强 2022-03-09 15:19:56 +0800
6b6eb66 (refs/pull/45/head) 更新-仓库-工序 by zwq 2022-03-09 15:19:23 +0800
02ac7ee Merge pull request '修改bug' (#44) from zwq into develop by 朱文强 2022-03-09 14:50:35 +0800
83fdc49 (refs/pull/44/head) 修改bug by zwq 2022-03-09 14:50:07 +0800
68902f0 Merge pull request '增加仓库-工序-提示' (#43) from zwq into develop by 朱文强 2022-03-09 14:32:55 +0800
76dba55 (refs/pull/43/head) 增加仓库-工序-提示 by zwq 2022-03-09 14:32:25 +0800
6630284 Merge pull request '仓库-工序存储区管理' (#42) from zwq into develop by 朱文强 2022-03-09 14:20:05 +0800
238d8ba (refs/pull/42/head) 仓库-工序存储区管理 by zwq 2022-03-09 14:19:03 +0800
27786fb Merge pull request 'update dashboard' (#41) from gtz into develop by 高天泽 2022-03-08 14:35:40 +0800
b6d0d32 (refs/pull/41/head) update dashboard by gtz217 2022-03-08 14:34:48 +0800
9f42c5e Merge pull request '更新工艺' (#40) from zwq into develop by 朱文强 2022-03-08 09:11:55 +0800
a2adcc0 (refs/pull/40/head) 更新工艺 by zwq 2022-03-08 09:11:34 +0800
0c0679c Merge pull request '更新工艺' (#39) from zwq into develop by 朱文强 2022-03-08 09:02:19 +0800
4743fdc (refs/pull/39/head) 更新工艺 by zwq 2022-03-08 09:01:47 +0800
cf888de Merge branch 'develop' into gtz by gtz217 2022-03-07 20:42:39 +0800
ba3983e update dashboard by gtz217 2022-03-07 20:42:06 +0800
c9d77e2 Merge pull request 'dashboard' (#38) from gtz into develop by 高天泽 2022-03-07 19:49:47 +0800
1ed431e (refs/pull/38/head) update by gtz217 2022-03-07 19:48:14 +0800
cbcbe5c Merge pull request '更新' (#37) from zwq into develop by 朱文强 2022-03-07 09:32:02 +0800
a214eb9 (refs/pull/37/head) 更新 by zwq 2022-03-07 09:31:40 +0800
e3be286 Merge pull request '更新' (#36) from zwq into develop by 朱文强 2022-03-07 09:17:49 +0800
f5a0038 (refs/pull/36/head) 更新 by zwq 2022-03-07 09:17:12 +0800
de76ca4 Merge pull request 'fzq' (#35) from fzq into develop by 朱文强 2022-03-07 09:07:28 +0800
95afd17 '' by Fanzink 2022-03-07 08:43:56 +0800
9f1a422 (refs/pull/35/head, refs/pull/34/head, refs/pull/33/head) '' by Fanzink 2022-03-07 08:41:20 +0800
9034498 Merge branch 'develop' into fzq by Fanzink 2022-03-06 19:36:56 +0800
9799768 '工序库位+报表' by Fanzink 2022-03-06 19:36:26 +0800
82f44b5 '基础+报表' by Fanzink 2022-03-05 19:43:42 +0800
2831646 Merge pull request 'fzq' (#32) from fzq into develop by 朱文强 2022-03-04 11:18:40 +0800
b5081ba (refs/pull/32/head) '不动vue.config.js' by Fanzink 2022-03-04 11:12:33 +0800
913e032 '' by Fanzink 2022-03-04 11:01:51 +0800
81e92cd '不动vue.config.js' by Fanzink 2022-03-04 10:59:43 +0800
aec5bca '' by Fanzink 2022-03-04 10:58:39 +0800
581ca3d (refs/pull/31/head) '' by Fanzink 2022-03-04 10:48:30 +0800
cb7718c '' by Fanzink 2022-03-04 10:47:28 +0800
7501849 Merge pull request '更新' (#30) from zwq into develop by 朱文强 2022-03-04 10:45:43 +0800
2a4fdee '不动vue.config.js' by Fanzink 2022-03-04 10:45:12 +0800
33a27dd (refs/pull/30/head) 更新 by zwq 2022-03-04 10:44:28 +0800
8801c44 (refs/pull/29/head) Merge branch 'develop' into fzq by Fanzink 2022-03-03 20:49:39 +0800
04cc50f '基础资料部分' by Fanzink 2022-03-03 20:48:59 +0800
878c9b2 Merge pull request 'eslint版本' (#28) from dy into develop by 朱文强 2022-03-03 16:59:38 +0800
0370713 (refs/pull/28/head, dy) eslint by dengyan 2022-03-03 16:57:29 +0800
56f59f5 (refs/pull/27/head) Merge branch 'develop' into dy by dengyan 2022-03-03 16:51:40 +0800
d9559db 设备稼动率 by dengyan 2022-03-03 16:51:09 +0800
8966dec Merge pull request '修改菜单，增加质量管理' (#26) from zwq into develop by 朱文强 2022-03-03 16:15:37 +0800
9513fb4 (refs/pull/26/head) 修改菜单，增加质量管理 by zwq 2022-03-03 16:15:01 +0800
68193ec Merge pull request '更新' (#25) from zwq into develop by 朱文强 2022-03-02 11:04:49 +0800
5a42c80 (refs/pull/25/head) 更新 by zwq 2022-03-02 11:03:56 +0800
ffdcbf6 修改vue.config.js by Fanzink 2022-02-28 15:53:44 +0800
f655b4d '' by Fanzink 2022-02-28 15:48:39 +0800
a0adee8 '' by Fanzink 2022-02-28 15:45:50 +0800
0cd8970 Merge pull request '更新' (#24) from zwq into develop by 朱文强 2022-02-28 10:59:14 +0800
597934b (refs/pull/24/head) 更新 by zwq 2022-02-28 10:58:51 +0800
fcb01aa Merge pull request '更新' (#23) from zwq into develop by 朱文强 2022-02-28 10:54:13 +0800
93be367 (refs/pull/23/head) 更新 by zwq 2022-02-28 10:53:52 +0800
80439e7 Merge pull request 'zwq' (#22) from zwq into develop by 朱文强 2022-02-28 10:50:12 +0800
6a33843 (refs/pull/22/head) 更新 by zwq 2022-02-28 10:49:30 +0800
e74632e (refs/pull/21/head) 更新 by zwq 2022-02-28 10:45:03 +0800
21d7a8f Merge pull request 'fzq' (#20) from fzq into develop by 朱文强 2022-02-28 10:33:30 +0800
6d2311b (refs/pull/20/head) '' by Fanzink 2022-02-28 10:09:59 +0800
3eac46b '' by Fanzink 2022-02-28 10:06:17 +0800
64c2748 (refs/pull/19/head, refs/pull/18/head, refs/pull/17/head) '' by Fanzink 2022-02-25 15:12:37 +0800
14bf2dc Merge pull request '修改接口api' (#16) from zwq into develop by 朱文强 2022-02-25 11:01:58 +0800
de1a783 (refs/pull/16/head) 修改接口api by zwq 2022-02-25 11:01:39 +0800
e023b9c Merge pull request '更新' (#15) from zwq into develop by 朱文强 2022-02-25 10:58:17 +0800
6e18a42 (refs/pull/15/head) Merge branch 'develop' into zwq by 朱文强 2022-02-25 10:58:05 +0800
7e6881f 更新 by zwq 2022-02-25 10:57:07 +0800
7c6d7b6 Merge pull request 'fix: 🐛 修正构建包安装顺序' (#14) from cicd into develop by 施海荣 2022-02-23 13:23:22 +0800
bb4f3e2 (refs/pull/14/head, cicd) fix: 🐛 修正构建包安装顺序 by thomas 2022-02-23 13:22:42 +0800
c4e7af8 Merge pull request 'fix: 🏗️ 修复raphael依赖找不到问题' (#13) from cicd into develop by 施海荣 2022-02-23 12:47:16 +0800
0338bf1 (refs/pull/13/head) fix: 🏗️ 修复raphael依赖找不到问题 by thomas 2022-02-23 12:46:46 +0800

1 2 3