Commit Graph

1820 Commits (169b09a3863df87be09113796db0d94e0936e3a9)

Author SHA1 Message Date
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
tianlinzhong a8fec3a7dd added access control to energycategory 2021-11-23 11:19:38 +08:00
Caozhenhui 365a0a903c added access control to meter 2021-11-23 11:08:29 +08:00
guangyuzhang 2a0ed5ba6c Merge branch 'develop' 2021-11-22 23:11:15 +08:00
guangyuzhang c7660d844f updated README 2021-11-22 23:11:06 +08:00
guangyuzhang 424fd317f6 Merge branch 'develop' 2021-11-21 22:58:17 +08:00
guangyuzhang 686a55d9a3 updated README 2021-11-21 22:56:21 +08:00
13621160019@163.com c0879e5443 Merge branch 'master' into develop 2021-11-20 22:00:55 +08:00
13621160019@163.com 566b57843a added access control to gateway, datasource and point 2021-11-20 21:51:38 +08:00
13621160019@163.com 108ca2c747 Merge branch 'develop' 2021-11-20 16:58:13 +08:00
13621160019@163.com abab76e34a updated README 2021-11-20 16:53:06 +08:00
13621160019@163.com 6ab686fa21 Merge branch 'develop' 2021-11-19 22:50:06 +08:00
13621160019@163.com d5155c04b8 added access control to offline meter file 2021-11-19 22:49:54 +08:00
13621160019@163.com 0bb6ea9663 Merge branch 'develop' 2021-11-19 22:15:25 +08:00
13621160019@163.com d15fef3b52 added access control to knowledge file 2021-11-19 22:10:59 +08:00
13621160019@163.com faa10dfbb7 Merge branch 'develop' 2021-11-18 22:52:35 +08:00
13621160019@163.com 2245dee31e added access control to cost file 2021-11-18 22:51:01 +08:00
13621160019@163.com 388b579f94 Merge branch 'develop' 2021-11-17 23:02:46 +08:00
13621160019@163.com f396564bc2 added access control to email server setting 2021-11-17 23:02:35 +08:00
13621160019@163.com 6bd78953e3 Merge branch 'develop' 2021-11-17 23:00:14 +08:00
13621160019@163.com 9937d0d051 added access control to email server 2021-11-17 22:58:24 +08:00