Commit Graph

97 Commits

Author SHA1 Message Date
Bob a06a2d1502 #更改数据库 2020-10-26 08:59:43 +08:00
Bob d628da4167 #更改数据库 2020-10-26 08:58:07 +08:00
Bob a6b389cf78 Merge remote-tracking branch 'origin/master' 2020-10-26 06:59:00 +08:00
Bob b136b98d63 #更改数据库 2020-10-26 06:58:49 +08:00
baoliang 79c454d7b5 Merge branch 'master' of http://git.eanbo.cn/xieshen/newmediamonitoring 2020-10-26 02:11:44 +08:00
baoliang 31622d81e2 add message 2020-10-26 02:11:34 +08:00
Bob 00341f9dc6 Merge remote-tracking branch 'origin/master' 2020-10-26 00:01:00 +08:00
Bob e0245512c9 #更改数据库 2020-10-26 00:00:52 +08:00
baoliang 5a2529e12e add message 2020-10-25 23:59:04 +08:00
baoliang bb69aa45bd Merge branch 'master' of http://git.eanbo.cn/xieshen/newmediamonitoring 2020-10-25 22:56:36 +08:00
baoliang 3967dadc26 add message 2020-10-25 22:56:33 +08:00
Bob 7d73ac7c22 Merge remote-tracking branch 'origin/master' 2020-10-25 22:22:35 +08:00
Bob 3a97945bc1 #更改数据库 2020-10-25 22:22:21 +08:00
baoliang 26ba6c0a36 add message 2020-10-25 22:18:41 +08:00
Bob e4c7110163 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	dashboard/models.py
2020-10-25 20:35:48 +08:00
Bob 53d832d922 #更改数据库 2020-10-25 20:33:21 +08:00
baoliang 6e5880f1ff add message 2020-10-25 20:01:49 +08:00
baoliang bc33d76de2 Merge branch 'master' of http://git.eanbo.cn/xieshen/newmediamonitoring 2020-10-25 19:49:46 +08:00
baoliang e5ee913548 add message 2020-10-25 19:49:42 +08:00
xieshen a32d01b564 #修改 2020-10-23 12:04:33 +08:00
Bob b69741bf1e #更改数据库 2020-10-23 08:50:51 +08:00
xieshen c81516a06f #修改 2020-10-22 17:41:31 +08:00
xieshen b4cd130266 #修改 2020-10-22 15:21:30 +08:00
xieshen 788750aa0a Merge branch 'master' of http://210.77.77.77/xieshen/newmediamonitoring 2020-10-22 15:15:37 +08:00
xieshen 008abe7eba #修改 2020-10-22 15:15:02 +08:00
baoliang 3466b6c88b add message 2020-10-22 12:05:23 +08:00
baoliang e964957abc add message 2020-10-22 00:29:06 +08:00
baoliang 7ce105c332 add message 2020-10-21 21:37:19 +08:00
xieshen 156e62fa23 #修改 2020-10-19 11:41:23 +08:00
xieshen 62503b1605 #修改 2020-10-17 17:12:56 +08:00
Bob fb2e227824 #更改数据库 2020-10-15 11:51:00 +08:00
Bob 9a1f2fc207 #更改数据库 2020-10-15 11:03:23 +08:00
Bob de3dea2798 #更改数据库 2020-10-15 09:06:37 +08:00
xieshen e79398713f #用户注册修改 2020-10-14 16:02:25 +08:00
baoliang cdb3eb216b add message 2020-10-13 22:42:50 +08:00
baoliang 1511e875b9 add message 2020-10-13 22:33:07 +08:00
Bob 84b8ee5a73 #手机验证码 2020-10-13 21:33:48 +08:00
xieshen 3c976c69d8 #用户注册修改 2020-10-13 18:13:08 +08:00
Bob 24bcc589b4 #zhuce 2020-10-13 14:46:15 +08:00
xieshen 5084800861 #用户注册修改 2020-10-13 10:56:12 +08:00
baoliang 0150bf4f8d add message 2020-10-11 01:42:12 +08:00
baoliang 07188d510a Merge branch 'master' of http://git.eanbo.cn/xieshen/newmediamonitoring 2020-10-10 22:44:26 +08:00
baoliang 85c9958a59 add task record 2020-10-10 22:44:15 +08:00
xieshen 8f50a5cd32 #功能修改 2020-10-10 15:54:36 +08:00
baoliang 4dc1ff018a add group profile 2020-10-10 15:46:04 +08:00
baoliang 65b8c1227d Merge branch 'master' of http://git.eanbo.cn/xieshen/newmediamonitoring 2020-10-09 20:09:21 +08:00
baoliang 1b41271a9c refact groupuser 2020-10-09 20:09:15 +08:00
Bob de6670e3ab Merge remote-tracking branch 'origin/master' 2020-10-09 09:42:20 +08:00
Bob ead258943d #监测 2020-10-09 09:42:05 +08:00
baoliang ef4f9d7004 add message 2020-10-08 15:12:48 +08:00