陶汉栋 / MyCloud

23 Dec, 2019

2 commits

d7030105 Merge branch 'master' of http://git.shunzhi.net/taohd/mycloud Browse Dir »

陶汉栋
2019-12-23 10:32:49 +0800
fc1b678f 物联增加联动功能 Browse Dir »

陶汉栋
2019-12-23 10:32:46 +0800

18 Dec, 2019

1 commit

8e0ce284 关注绑定 Browse Dir »

陈杰
2019-12-18 11:00:37 +0800

12 Dec, 2019

4 commits

fd11d1a7 Merge branch 'master' of http://git.shunzhi.net/taohd/mycloud Browse Dir »

陶汉栋
2019-12-12 23:05:28 +0800
7677dd47 海康服务调整，大华服务优化 Browse Dir »

陶汉栋
2019-12-12 23:05:25 +0800
e7df2a10 考勤推送 Browse Dir »

陈杰
2019-12-12 14:59:54 +0800
02191019 考勤推送修改，绑定关注逻辑 Browse Dir »

陈杰
2019-12-12 11:46:02 +0800

11 Dec, 2019

2 commits

46eaf1b0 Merge branch 'master' of http://git.shunzhi.net/taohd/mycloud Browse Dir »

陶汉栋
2019-12-11 09:49:55 +0800
9d70d292 no message Browse Dir »

陶汉栋
2019-12-11 09:49:51 +0800

06 Dec, 2019

1 commit

3560cf47 考勤推送 Browse Dir »

陈杰
2019-12-06 11:20:00 +0800

05 Dec, 2019

3 commits

3898e462 考勤推送 Browse Dir »

陈杰
2019-12-05 16:52:16 +0800
a8a87475 Merge remote-tracking branch 'origin/master' Browse Dir »

陈杰
2019-12-05 13:56:59 +0800
ee9dcc1b 考勤推送 Browse Dir »

陈杰
2019-12-05 13:56:47 +0800

03 Dec, 2019

2 commits

375d859f 1、大华人脸抓拍完成 ... Browse Dir »
```
2、指纹机修复历史记录上传问题
```
陶汉栋
2019-12-03 17:56:16 +0800
46343ee1 no message Browse Dir »

陶汉栋
2019-12-03 17:55:06 +0800

02 Dec, 2019

1 commit

557a2d5b 考勤推送 Browse Dir »

陈杰
2019-12-02 10:59:26 +0800

29 Nov, 2019

5 commits

16f6cb8b 考勤推送 Browse Dir »

陈杰
2019-11-29 18:08:21 +0800
ad680c7b 考勤推送 Browse Dir »

陈杰
2019-11-29 15:44:35 +0800
f0ac21af Merge branch 'master' of http://git.shunzhi.net/taohd/mycloud ... Browse Dir »
```
# Conflicts:
#	cloud/pom.xml
```
陶汉栋
2019-11-29 14:25:16 +0800
4571d562 no message Browse Dir »

陶汉栋
2019-11-29 14:24:25 +0800
e69fcc95 考勤推送 Browse Dir »

陈杰
2019-11-29 09:59:23 +0800

28 Nov, 2019

1 commit

81cae9e2 考勤推送 Browse Dir »

陈杰
2019-11-28 14:50:13 +0800

27 Nov, 2019

4 commits

6398a6ab Merge remote-tracking branch 'origin/master' Browse Dir »

陈杰
2019-11-27 10:43:26 +0800
b537495d 微耕 Browse Dir »

陈杰
2019-11-27 10:43:14 +0800
61736aca no message Browse Dir »

陶汉栋
2019-11-27 10:38:08 +0800
512004d7 no message Browse Dir »

陶汉栋
2019-11-27 10:37:46 +0800

26 Nov, 2019

1 commit

3bc07178 no message Browse Dir »

陶汉栋
2019-11-26 00:08:33 +0800

25 Nov, 2019

13 commits

53e55eaa Merge branch 'master' of http://git.shunzhi.net/taohd/mycloud ... Browse Dir »
```
# Conflicts:
#	cloud/common/pom.xml
#	cloud/pom.xml
#	cloud/weigeng/pom.xml
#	cloud/weigeng/src/main/java/com/sincere/weigeng/WeigengApplication.java
```
陶汉栋
2019-11-25 15:22:58 +0800
27ae8e11 no message Browse Dir »

陶汉栋
2019-11-25 15:19:56 +0800
2382f6c5 打包问题解决 Browse Dir »

陈杰
2019-11-25 12:10:57 +0800
c5e63bdb no message Browse Dir »

陶汉栋
2019-11-25 11:10:44 +0800
55460031 no message Browse Dir »

陶汉栋
2019-11-25 11:01:26 +0800
5e25decc no message Browse Dir »

陶汉栋
2019-11-25 10:57:25 +0800
f79b70be no message Browse Dir »

陶汉栋
2019-11-25 10:56:24 +0800

a6f5c7a1 Merge branch 'master' of http://git.shunzhi.net/taohd/mycloud ... Browse Dir »

# Conflicts:
#	cloud/weigeng/src/main/java/com/sincere/weigeng/WatchServer.java
#	cloud/weigeng/src/main/java/com/sincere/weigeng/controller/WgController.java
#	cloud/weigeng/src/main/java/com/sincere/weigeng/utils/WgUdpCommShort.java

2019-11-25 10:51:24 +0800

44ae409b no message Browse Dir »

陶汉栋
2019-11-25 10:48:27 +0800
440ab2e4 自启监听 Browse Dir »

陈杰
2019-11-25 10:43:39 +0800
c3e43e03 no message Browse Dir »

陶汉栋
2019-11-25 10:37:36 +0800

aba3413b Merge branch 'master' of http://git.shunzhi.net/taohd/mycloud ... Browse Dir »

# Conflicts:
#	cloud/weigeng/src/main/java/com/sincere/weigeng/dao/UserDao.java
#	cloud/weigeng/src/test/java/com/sincere/weigeng/WeigengApplicationTests.java

2019-11-25 10:10:56 +0800

45a76ba8 no message Browse Dir »

陶汉栋
2019-11-25 10:09:03 +0800