Commit Graph

52 Commits

Author SHA1 Message Date
837a48b372 Merge pull request 'gtz' (#11) from gtz into master
Reviewed-on: #11
2022-03-18 08:29:06 +08:00
d894c8bbfa update 2022-03-18 08:26:53 +08:00
504cf1af05 update 2022-01-04 08:51:40 +08:00
57b92d146a update 2021-12-17 18:28:11 +08:00
eb3288b3ed update 2021-12-17 17:13:28 +08:00
1231ba99c3 Merge branch 'master' into gtz 2021-12-17 16:32:43 +08:00
370a79d17f Merge pull request '修改组件靠右' (#10) from zwq into master
Reviewed-on: #10
2021-12-17 16:12:14 +08:00
zwq
4b0dd97426 修改组件靠右 2021-12-17 16:11:49 +08:00
9e62cc95de Merge branch 'master' into gtz 2021-12-17 15:36:29 +08:00
c2e6ddea34 1 2021-12-17 15:36:11 +08:00
350c93c9f8 Merge pull request '新增页面' (#9) from zwq into master
Reviewed-on: #9
2021-12-17 15:29:33 +08:00
zwq
35d96759a1 新增页面 2021-12-17 15:29:04 +08:00
8ea747cbbf update 2021-12-16 21:00:38 +08:00
95dc548e21 update energy 2021-12-16 20:18:52 +08:00
6064bd1961 update 2021-12-16 10:45:41 +08:00
741a7a8995 update tab_item 2021-12-16 10:29:09 +08:00
7f4d5b0ff8 update 2021-12-15 19:36:23 +08:00
38eb8050bd update 2021-12-14 21:12:32 +08:00
1baad3e64b update 2021-12-10 17:07:52 +08:00
f445045cc4 update 2021-12-10 17:07:29 +08:00
9f3c13f893 merge 2021-12-08 16:04:59 +08:00
d29b807247 merge 2021-12-08 16:03:47 +08:00
b94ecf28da merge 2021-12-08 16:01:51 +08:00
2fda922944 Merge pull request '对接后台,部分已完成' (#8) from zwq into master
Reviewed-on: #8
2021-12-08 14:54:54 +08:00
zwq
ee44a9f77f 对接后台,部分已完成 2021-12-08 14:54:13 +08:00
ab898dda04 Merge pull request '修改字段' (#7) from zwq into master
Reviewed-on: #7
2021-12-01 16:46:54 +08:00
zwq
5579b657d5 修改字段 2021-12-01 16:46:26 +08:00
6073b6d43b update 2021-12-01 14:53:42 +08:00
124f27fe5f del some common 2021-11-30 21:19:08 +08:00
9325ce5fdb update 2021-11-30 21:05:26 +08:00
bda097fe8c update 2021-11-26 17:15:20 +08:00
db51049507 Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-ui 2021-11-25 20:06:10 +08:00
abcc75f669 update 2021-11-25 20:06:07 +08:00
945e332181 Merge pull request '修改首页路由显示' (#6) from zwq into master
Reviewed-on: #6
2021-11-23 13:48:06 +08:00
zwq
a0d647caf9 修改首页路由显示 2021-11-23 13:47:44 +08:00
377043e9c8 add chart 2021-11-22 19:36:28 +08:00
2a23e5a866 Merge pull request '订单和报表' (#5) from zwq into master
Reviewed-on: #5
2021-11-19 16:37:10 +08:00
zwq
2bcf7e471d 订单和报表 2021-11-19 16:36:32 +08:00
431c7fd708 Merge pull request '完成所有页面路由' (#4) from zwq into master
Reviewed-on: #4
2021-11-19 11:16:36 +08:00
zwq
316857235f 完成所有页面路由 2021-11-19 11:15:58 +08:00
72416231c0 Merge pull request '基础信息' (#3) from zwq into master
Reviewed-on: #3
2021-11-19 08:40:07 +08:00
ba97136917 Merge branch 'master' into zwq 2021-11-19 08:40:02 +08:00
zwq
39bcf95359 基础信息 2021-11-19 08:39:29 +08:00
428a2cafb3 Merge pull request '首页静态页面' (#2) from zwq into master
Reviewed-on: #2
2021-11-17 16:16:24 +08:00
e9bde35c50 Merge branch 'master' into zwq 2021-11-17 16:16:19 +08:00
zwq
290d1465c6 首页静态页面 2021-11-17 16:15:33 +08:00
c288c61447 Merge pull request '新增首页部分页面' (#1) from zwq into master
Reviewed-on: #1
2021-11-17 10:26:14 +08:00
zwq
181c50764e 新增首页部分页面 2021-11-17 10:23:35 +08:00
zwq
d9810b14b5 改成人人基础 2021-11-15 08:22:01 +08:00
c951ee56f5 init 2021-10-20 16:25:18 +08:00