Commit Graph

1940 Commits (db1b32b4f9b9f2f00f57e3daace2043bccd4f42f)

Author SHA1 Message Date
13621160019@163.com 3ec50fab0d added access control to sersor in api and admin 2021-12-03 19:53:12 +08:00
13621160019@163.com b10cc91a3a Merge branch 'PR89' into develop 2021-12-03 19:21:08 +08:00
13621160019@163.com d28969d141 Merge branch 'develop' 2021-12-03 19:11:16 +08:00
13621160019@163.com 4e0961e5fb added access control to distribution system in api and admin 2021-12-03 19:09:39 +08:00
13621160019@163.com 05b5631408 Merge branch 'PR88' into develop 2021-12-03 17:01:21 +08:00
13621160019@163.com 3fba1f7a6d Merge commit 'refs/pull/88/head' of https://gitee.com/myems/myems 2021-12-03 16:59:07 +08:00
Caozhenhui 0edaf58aee added access control to sensorpoint 2021-12-03 16:42:18 +08:00
Caozhenhui 2eaa8df6c6 added access control to sensor 2021-12-03 16:36:48 +08:00
tianlinzhong 469c21672b distrbutioncircuit/distributionsystem of access_control 2021-12-03 14:58:04 +08:00
13621160019@163.com d6c5d964dd Merge branch 'develop' 2021-12-03 14:21:36 +08:00
13621160019@163.com fb8284ca52 added access control to privilege in api and admin 2021-12-03 14:16:51 +08:00
13621160019@163.com 624e4f7e3b Merge branch 'PR87' into develop 2021-12-03 14:00:48 +08:00
13621160019@163.com 468b2e4320 Merge branch 'develop' 2021-12-03 13:52:02 +08:00
13621160019@163.com 8f2db8952f added access control to energyflowdiagram in api and admin 2021-12-03 13:51:32 +08:00
13621160019@163.com e37b83fd54 Merge branch 'PR86' into develop 2021-12-03 12:37:36 +08:00
Caozhenhui 29f3b91e56 fixed the sequence of parameter 2021-12-02 10:57:39 +08:00
Caozhenhui 8dd998ed0c added access_control to privilege 2021-12-02 10:43:32 +08:00
tianlinzhong 62312e8c54 energyflowdiagram of access_control2 2021-12-02 09:56:13 +08:00
tianlinzhong f685728985 Merge remote-tracking branch 'origin/develop' into develop 2021-12-02 09:09:38 +08:00
13621160019@163.com 112d0cc8d3 Merge branch 'develop' 2021-12-01 22:18:51 +08:00
13621160019@163.com 213f669924 added access control to energyitem in api and admin 2021-12-01 22:16:11 +08:00
tianlinzhong c7fe4dea79 energyflowdiagram of access_control 2021-12-01 14:21:38 +08:00
13621160019@163.com d724240774 Merge branch 'develop' 2021-11-30 22:59:55 +08:00
13621160019@163.com 637f8ce481 added accecc_control to contact in api and admin 2021-11-30 22:57:51 +08:00
13621160019@163.com 0d7a7de17f Merge branch 'PR83' into develop 2021-11-30 22:41:49 +08:00
Caozhenhui 8481fa68a5 modified postman_collection.json 2021-11-30 10:13:11 +08:00
Caozhenhui 20db5357b2 modified postman_collection.json 2021-11-30 10:11:04 +08:00
Caozhenhui 6e53449439 added access control to EnergyItem 2021-11-30 10:07:12 +08:00
Caozhenhui 16c7e858fb added access control to EnergyItem 2021-11-30 10:00:38 +08:00
tianlinzhong 9304225419 contact of access_control 2021-11-29 18:48:29 +08:00
13621160019@163.com 82a4c188d7 Merge branch 'develop' 2021-11-29 17:47:38 +08:00
13621160019@163.com dfec9a8fc0 added access_control to menu in api and admin 2021-11-29 17:46:14 +08:00
13621160019@163.com 7995e52027 Merge branch 'PR82' into develop 2021-11-29 17:09:31 +08:00
tianlinzhong d5ad69b7b9 menu of access_control2 2021-11-29 17:02:06 +08:00
tianlinzhong 7a2d2a3f1d menu of access_control 2021-11-29 16:07:31 +08:00
13621160019@163.com 0fc5c6bc96 Merge branch 'develop' 2021-11-28 20:48:38 +08:00
13621160019@163.com ccf7b9d435 updated requirements of myems-api 2021-11-28 20:46:46 +08:00
13621160019@163.com 32ea1ced96 Merge branch 'develop' 2021-11-27 21:19:01 +08:00
13621160019@163.com 3b0d4a13f5 added access control to meter in api and admin 2021-11-27 21:15:43 +08:00
13621160019@163.com ca5d525932 Merge branch 'develop' 2021-11-26 20:09:02 +08:00
13621160019@163.com d937acd1bb fixed issue of EnergyCategory in admin and updated README of admin 2021-11-26 20:05:01 +08:00
13621160019@163.com 9309e9643a Merge branch 'develop' 2021-11-26 19:18:40 +08:00
13621160019@163.com 27f9bb8629 updated postman collection and README of myems-api 2021-11-26 19:17:09 +08:00
13621160019@163.com fc0a641fde Merge branch 'develop' 2021-11-25 17:18:13 +08:00
13621160019@163.com 013ee28003 updated README 2021-11-25 16:55:26 +08:00
guangyuzhang 9efc4a7c6b Merge branch 'develop' 2021-11-23 23:16:44 +08:00
guangyuzhang 8e0bb54616 Merge branch 'PR81' into develop 2021-11-23 23:16:24 +08:00
guangyuzhang 002b1cef78 Merge branch 'develop' 2021-11-23 23:11:09 +08:00
guangyuzhang f812479e7f Merge branch 'PR80' into develop 2021-11-23 23:09:54 +08:00
tianlinzhong d7cad1d6e0 added access control to energycategory 2021-11-23 11:29:36 +08:00