Commit Graph

2018 Commits (8d87b3625b6e3ed9d41f3317ba707c5423a33830)

Author SHA1 Message Date
13621160019@163.com 95c8dd95d5 Merge branch 'PR' into develop 2021-12-07 20:14:55 +08:00
13621160019@163.com 9504aa856f Merge branch 'develop' 2021-12-07 20:02:01 +08:00
13621160019@163.com 167d6a2caa added access control to point in api and admin 2021-12-07 20:00:28 +08:00
13621160019@163.com 9c9e316efc added access control to point in api and admin 2021-12-07 19:50:37 +08:00
13621160019@163.com 043416500a Merge branch 'PR' into develop 2021-12-07 19:38:09 +08:00
Caozhenhui 8ea1d4a812 added access control to shopfloor tenant and store 2021-12-07 15:04:26 +08:00
tianlinzhong be77f29b3b point of access_control 2021-12-07 14:35:41 +08:00
13621160019@163.com 0413ca15ea Merge branch 'develop' 2021-12-06 23:04:43 +08:00
13621160019@163.com 15cc27ac18 added access control to equipment in api and admin 2021-12-06 23:02:27 +08:00
13621160019@163.com 9b417d0648 Merge branch 'PR' into develop 2021-12-06 22:17:44 +08:00
13621160019@163.com ed6941545a Merge branch 'develop' 2021-12-06 19:34:38 +08:00
13621160019@163.com 57671aa2b6 added access control to combinedequipment in api and admin 2021-12-06 19:31:51 +08:00
13621160019@163.com a8ef300a08 Merge branch 'PR89' into develop 2021-12-06 19:05:00 +08:00
tianlinzhong 0bf0c829d0 equipment of access_control 2021-12-06 15:26:27 +08:00
Caozhenhui fb31837efa added access_control to combinedequipment 2021-12-06 14:52:15 +08:00
13621160019@163.com 3594505ddd Merge branch 'develop' 2021-12-06 11:21:54 +08:00
13621160019@163.com b9de4e3c43 added qq group qr code 2021-12-06 11:20:24 +08:00
13621160019@163.com fd0d66cf1c Merge branch 'develop' 2021-12-05 22:46:03 +08:00
13621160019@163.com 5d1e469894 updated nofification(web message) in web and api 2021-12-05 22:37:59 +08:00
13621160019@163.com 150791963f Merge branch 'develop' 2021-12-05 18:08:16 +08:00
13621160019@163.com cd94e31a98 added user varification to webmessage in admin and api 2021-12-05 18:06:50 +08:00
13621160019@163.com 8a3da85af5 Merge branch 'develop' 2021-12-05 12:56:41 +08:00
13621160019@163.com 996f7066e1 added access control to wechat message in api and admin 2021-12-05 12:37:42 +08:00
13621160019@163.com 14eaf2379c Merge branch 'develop' 2021-12-04 20:50:41 +08:00
13621160019@163.com 65565a5351 added access control to text message in api and admin 2021-12-04 20:48:56 +08:00
13621160019@163.com 4387472651 Merge branch 'develop' 2021-12-04 19:55:14 +08:00
13621160019@163.com 3e536d503e added access control to email message in api and admin 2021-12-04 19:52:12 +08:00
13621160019@163.com 6e4a697d99 Merge branch 'develop' 2021-12-03 19:55:32 +08:00
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