xt / xcx-book · Commits

29 Sep, 2018

11 commits

Merge remote-tracking branch 'origin/master'
6536ef2b

by wangfan
2018-09-29 16:16:58 +0800
Browse Files
记录人
2020ae47

by wangfan
2018-09-29 16:16:47 +0800
Browse Files
Merge remote-tracking branch 'origin/master'
1e68ed77

by zhangyan
2018-09-29 16:08:16 +0800
Browse Files
预定列表
11a65f83

by zhangyan
2018-09-29 16:08:11 +0800
Browse Files
fixbug 日历显示
 942c4bff

by wangfan
2018-09-29 15:44:14 +0800
Browse Files
预定列表
 795ca127

by zhangyan
2018-09-29 15:33:11 +0800
Browse Files
预定列表
 5d521d99

by zhangyan
2018-09-29 15:28:25 +0800
Browse Files
预定列表
 97c5f52e

by zhangyan
2018-09-29 15:19:48 +0800
Browse Files
预定列表
 f7404909

by zhangyan
2018-09-29 14:06:10 +0800
Browse Files
fixbug 日历点击
 e86d76c0

by wangfan
2018-09-29 12:16:59 +0800
Browse Files
预定列表
 fc05c6d5

by zhangyan
2018-09-29 10:49:13 +0800
Browse Files

28 Sep, 2018

27 commits

更多桌位
 b9e6b2f8

by zhangyan
2018-09-28 18:06:58 +0800
Browse Files
更多桌位
 a8aa02ae

by zhangyan
2018-09-28 17:48:47 +0800
Browse Files
更多桌位
 0932a8df

by zhangyan
2018-09-28 17:45:48 +0800
Browse Files
更多桌位
 9b12815a

by zhangyan
2018-09-28 17:30:27 +0800
Browse Files
Merge remote-tracking branch 'origin/master' ...
a27d01fa
```
# Conflicts:
#	pages/book/b_addnew.js
```
by zhangyan
2018-09-28 17:14:07 +0800
Browse Files
fixbug tablesLength
c1258cb0

by wangfan
2018-09-28 17:13:40 +0800
Browse Files
更多桌位
ebebf7f7

by zhangyan
2018-09-28 17:12:57 +0800
Browse Files
Merge remote-tracking branch 'origin/master'
12531dec

by zhangyan
2018-09-28 17:07:15 +0800
Browse Files
Merge branch 'master' of /Volumes/DATA/Workspace/book with conflicts.
be55ba24

by zhangyan
2018-09-28 17:07:15 +0800
Browse Files
fixbug tablesLength
26b97789

by wangfan
2018-09-28 17:06:05 +0800
Browse Files
Merge remote-tracking branch 'remotes/origin/timespace' ...
ba7cf045
```
# Conflicts:
#	pages/book/b_addnew.js
#	project.config.json
```
by wangfan
2018-09-28 16:46:40 +0800
Browse Files
Merge remote-tracking branch 'remotes/origin/timespace' ...
862b6a9b
```
# Conflicts:
#	pages/book/b_addnew.js
#	project.config.json
```
by wangfan
2018-09-28 16:43:34 +0800
Browse Files
Merge remote-tracking branch 'remotes/origin/timespace' ...
9bcb5dbe
```
# Conflicts:
#	pages/book/b_addnew.js
#	project.config.json
```
by wangfan
2018-09-28 16:41:52 +0800
Browse Files
v2 time
64d4b2ed

by wangfan
2018-09-28 16:18:19 +0800
Browse Files
v2 time
e15246ec

by wangfan
2018-09-28 15:56:50 +0800
Browse Files
v2 time
5a8e257f

by wangfan
2018-09-28 12:20:05 +0800
Browse Files
更多桌位
 3b508006

by zhangyan
2018-09-28 11:45:32 +0800
Browse Files
更多桌位
 83366eca

by zhangyan
2018-09-28 11:31:56 +0800
Browse Files
Merge remote-tracking branch 'origin/master' ...
a94d651e
```
# Conflicts:
#	pages/book/b_addnew.js
```
by zhangyan
2018-09-28 11:31:26 +0800
Browse Files
v2 time
ec2ea07a

by wangfan
2018-09-28 11:32:09 +0800
Browse Files
更多桌位
ceae55a6

by zhangyan
2018-09-28 11:30:55 +0800
Browse Files
更多桌位
 be17e6fa

by zhangyan
2018-09-28 11:28:26 +0800
Browse Files
v2 time
097258a8

by wangfan
2018-09-28 11:14:39 +0800
Browse Files
no message
3e85babb

by zhangyan
2018-09-28 11:13:35 +0800
Browse Files
Merge branch 'master' of http://123.56.79.57/xt/xcx-book ...
92117889
```
Conflicts:
	pages/book/b_addnew.js
```
by zhangyan
2018-09-28 11:06:42 +0800
Browse Files
no message
379284cb

by zhangyan
2018-09-28 11:02:33 +0800
Browse Files
v2 merge vking
a932e1ce

by wangfan
2018-09-28 10:24:20 +0800
Browse Files

27 Sep, 2018

2 commits

v2 book sendsms
7057ca9a

by wangfan
2018-09-27 18:48:00 +0800
Browse Files
no message
5ec18909

by zhangyan
2018-09-27 18:20:59 +0800
Browse Files