陶汉栋 / MyCloud

25 Nov, 2019

11 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
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

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