xt / xcx-book · Commits

28 Sep, 2018

15 commits

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

10 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
no message
01b6d5f7

by zhangyan
2018-09-27 18:13:23 +0800
Browse Files
no message
5146bd0c

by zhangyan
2018-09-27 18:04:07 +0800
Browse Files
v2 book sendsms
7bad6ec4

by wangfan
2018-09-27 18:02:10 +0800
Browse Files
no message
346a26c9

by zhangyan
2018-09-27 18:01:47 +0800
Browse Files
v2 book sendsms
efd73b53

by wangfan
2018-09-27 14:40:43 +0800
Browse Files
v2 book sendsms
22f607f5

by wangfan
2018-09-27 12:10:48 +0800
Browse Files
v2 book sendsms
72d9122e

by wangfan
2018-09-27 12:00:06 +0800
Browse Files
v2 book sendsms
e564f49b

by wangfan
2018-09-27 11:48:39 +0800
Browse Files

26 Sep, 2018

3 commits

v2 book list
352c5b42

by wangfan
2018-09-26 18:38:59 +0800
Browse Files
v2 book list
2c232e8c

by wangfan
2018-09-26 17:34:56 +0800
Browse Files
v2 book set
48c44dba

by wangfan
2018-09-26 16:39:44 +0800
Browse Files

25 Sep, 2018

2 commits

v2 book
680206b1

by wangfan
2018-09-25 17:48:52 +0800
Browse Files
v2 book
f750f459

by wangfan
2018-09-25 15:42:17 +0800
Browse Files

21 Sep, 2018

10 commits

v2 customer view
2025f457

by wangfan
2018-09-21 17:30:44 +0800
Browse Files
v2 customer view
32a30e50

by wangfan
2018-09-21 17:18:32 +0800
Browse Files
v2 customer view
9654c5fe

by wangfan
2018-09-21 17:15:05 +0800
Browse Files
v2 customer view
68d22c2f

by wangfan
2018-09-21 17:12:33 +0800
Browse Files
v2 customer view
68c6746b

by wangfan
2018-09-21 17:08:13 +0800
Browse Files
v2 customer view
63eedcff

by wangfan
2018-09-21 15:52:26 +0800
Browse Files
v2 customer view
115e72cb

by wangfan
2018-09-21 15:51:14 +0800
Browse Files
v2 customer view
f66eb03b

by wangfan
2018-09-21 15:41:37 +0800
Browse Files
v2 customer view
42cdb931

by wangfan
2018-09-21 15:27:40 +0800
Browse Files
v2 customer view
3ec49d76

by wangfan
2018-09-21 15:25:03 +0800
Browse Files