13621160019@163.com
|
87ad8bad93
|
Merge branch 'develop'
|
2022-01-13 10:28:40 +08:00 |
|
13621160019@163.com
|
63397a1eee
|
added qrcode string to tenant, equipment, and combinedequipment in api
|
2022-01-13 10:05:27 +08:00 |
|
13621160019@163.com
|
4fe812cde2
|
Merge branch 'develop'
|
2022-01-12 22:28:16 +08:00 |
|
13621160019@163.com
|
ec74c31b6f
|
added qrcode in string to store in api
|
2022-01-12 22:26:52 +08:00 |
|
13621160019@163.com
|
373168933e
|
Merge branch 'develop'
|
2022-01-12 21:57:24 +08:00 |
|
13621160019@163.com
|
064f47786d
|
added QRCode in String to Space in API
|
2022-01-12 21:51:04 +08:00 |
|
13621160019@163.com
|
c0116cbcef
|
Merge branch 'develop'
|
2022-01-12 21:38:46 +08:00 |
|
13621160019@163.com
|
6c3ca2314f
|
added qrcode to shopfloor
|
2022-01-12 21:34:53 +08:00 |
|
13621160019@163.com
|
e3d88695e8
|
Merge branch 'develop'
|
2022-01-12 12:57:04 +08:00 |
|
13621160019@163.com
|
ecbebd4ea0
|
updated year in LICENSE
|
2022-01-12 12:38:31 +08:00 |
|
13621160019@163.com
|
c560e90c7e
|
Merge branch 'develop'
|
2022-01-12 12:04:01 +08:00 |
|
13621160019@163.com
|
85a2728faf
|
changed meter qrcode from svg to string
|
2022-01-12 11:58:36 +08:00 |
|
13621160019@163.com
|
397b54b79c
|
Merge branch 'PR' into develop
|
2022-01-11 14:40:38 +08:00 |
|
13621160019@163.com
|
3cc74e1322
|
Merge branch 'develop'
|
2022-01-11 13:02:53 +08:00 |
|
13621160019@163.com
|
8a2f79ad4d
|
updated README
|
2022-01-11 13:01:59 +08:00 |
|
Caozhenhui
|
1dbe058abd
|
used bytesIO deal with qrcode
|
2022-01-11 10:28:28 +08:00 |
|
Caozhenhui
|
a04ad940c8
|
used bytesIO deal with qrcode
|
2022-01-11 10:26:48 +08:00 |
|
Caozhenhui
|
b41608aaf3
|
added 'qrcode' parameter to meter
|
2022-01-10 14:21:23 +08:00 |
|
Caozhenhui
|
53f76d14bf
|
added 'qrcode' parameter to meter
|
2022-01-10 09:58:19 +08:00 |
|
Caozhenhui
|
6af787af27
|
added 'qrcode' parameter to meter
|
2022-01-10 09:55:51 +08:00 |
|
Caozhenhui
|
a4a1cfaa2a
|
2022/1/10
|
2022-01-10 09:41:45 +08:00 |
|
13621160019@163.com
|
632d97b2d5
|
Merge branch 'develop'
|
2022-01-07 21:58:02 +08:00 |
|
13621160019@163.com
|
1a97d02fcd
|
updated README
|
2022-01-07 21:55:16 +08:00 |
|
13621160019@163.com
|
4e3d34a557
|
Merge branch 'develop'
|
2022-01-07 21:13:38 +08:00 |
|
13621160019@163.com
|
3afaee3c5e
|
Merge branch 'PR' into develop
|
2022-01-07 21:05:06 +08:00 |
|
tianlinzhong
|
0410f29889
|
Improved Tariff Editor2
|
2022-01-07 18:26:47 +08:00 |
|
tianlinzhong
|
2e0e7c5d93
|
Improved Tariff Editor
|
2022-01-07 17:31:31 +08:00 |
|
Caozhenhui
|
f28431a511
|
2022-1-7
|
2022-01-07 16:31:44 +08:00 |
|
Caozhenhui
|
b96528e70b
|
test
|
2022-01-07 16:28:00 +08:00 |
|
guangyuzhang
|
b64f94251c
|
Merge branch 'master' of https://gitee.com/myems/myems
|
2022-01-05 22:45:29 +08:00 |
|
guangyuzhang
|
342c6b1be7
|
Merge branch 'develop'
|
2022-01-05 22:44:56 +08:00 |
|
guangyuzhang
|
00e30108cb
|
updated echarts version to 5.2.2 in web ui
|
2022-01-05 22:44:20 +08:00 |
|
guangyuzhang
|
3685a06da1
|
Merge branch 'PR' into develop
|
2022-01-05 22:19:51 +08:00 |
|
13621160019@163.com
|
429a96c1b1
|
Merge branch 'develop'
|
2022-01-04 22:22:56 +08:00 |
|
13621160019@163.com
|
7459c37ea1
|
improved virtual meter editor in admin ui
|
2022-01-04 22:21:18 +08:00 |
|
13621160019@163.com
|
cc5269fd18
|
Merge branch 'PR' into develop
|
2022-01-04 22:14:00 +08:00 |
|
tianlinzhong
|
3f096b592d
|
Improved Virtual Meter Editor
|
2022-01-04 15:34:12 +08:00 |
|
Caozhenhui
|
827d42e898
|
fixed issue 183
|
2022-01-04 11:53:31 +08:00 |
|
Caozhenhui
|
4d5e58f9cf
|
fixed issue 183
|
2022-01-04 11:32:28 +08:00 |
|
Caozhenhui
|
617c7825b4
|
fixed issue 183
|
2022-01-04 11:25:46 +08:00 |
|
13621160019@163.com
|
99d9e0881b
|
Merge branch 'develop'
|
2022-01-03 23:00:06 +08:00 |
|
13621160019@163.com
|
23412c2817
|
added docker image immigration to readme
|
2022-01-03 22:56:45 +08:00 |
|
13621160019@163.com
|
7773f7ed73
|
Merge branch 'develop'
|
2022-01-02 19:31:46 +08:00 |
|
13621160019@163.com
|
f26d96d1b6
|
updated Dockerfiles
|
2022-01-02 19:30:01 +08:00 |
|
13621160019@163.com
|
5b42e40463
|
Merge branch 'develop'
|
2022-01-01 18:38:09 +08:00 |
|
13621160019@163.com
|
169b09a386
|
updated readme
|
2022-01-01 18:36:14 +08:00 |
|
13621160019@163.com
|
36ff732d43
|
Merge branch 'develop'
|
2021-12-31 12:47:28 +08:00 |
|
13621160019@163.com
|
35d2d7306a
|
updated version number to v1.6.0
|
2021-12-31 12:47:17 +08:00 |
|
13621160019@163.com
|
50cc56186d
|
Merge branch 'develop'
|
2021-12-31 12:07:33 +08:00 |
|
13621160019@163.com
|
59796fb990
|
Merge branch 'PR' into develop
|
2021-12-31 11:45:06 +08:00 |