Commit Graph

Select branches

Hide Pull Requests

account

course

dev

devMac

feat-230721

gongyingshang

master

md0726

organize

privacy

tid1509

tid1731

tid1867

tid1878

voice

voice08

v1.1.30

Mono Color

• 3fd6dfe75c fix site manage time 刘嘉炜 2021-11-04 11:44:33 +0800
• a3d46b9513 test merge 刘嘉炜 2021-11-03 17:26:59 +0800
• f2b5ca16c3 add ym order sty 刘嘉炜 2021-11-03 13:46:34 +0800
• 5c601a3e92 Merge branch 'dev' into ymorder 刘嘉炜 2021-11-02 11:36:33 +0800
• f5b608affb fix order bug 刘嘉炜 2021-11-01 15:19:15 +0800
• 05c76606ce merge dev v1.1.11 刘嘉炜 2021-11-01 11:46:08 +0800
• 9ed8cb111f v1.1.11 formal 刘嘉炜 2021-11-01 11:45:15 +0800
• 658bf7a16b fix mall num 刘嘉炜 2021-11-01 11:43:01 +0800
• 6d6a2157a0 vtest 1.1.11 郑锦全 2021-10-29 18:21:45 +0800
• a96f409773 add ym-order 刘嘉炜 2021-10-29 17:42:56 +0800
• 6dc1ae832d Merge branch 'dev' into ymorder 刘嘉炜 2021-10-29 15:16:28 +0800
• 53301714d1 fix order bug 刘嘉炜 2021-10-29 15:15:56 +0800
• 1ab6c98e9c fix order bug 刘嘉炜 2021-10-28 15:07:11 +0800
• f6510da2d2 merge dev couse 刘嘉炜 2021-10-28 11:47:31 +0800
• eb9783ef7b Merge branch 'course' into dev 郑锦全 2021-10-28 10:30:14 +0800
• bd75573fea fix order 刘嘉炜 2021-10-27 16:44:43 +0800
• 9f3fe2dbf8 fix order 刘嘉炜 2021-10-26 18:01:19 +0800
• 732a3cce94 fix all 郑锦全 2021-10-26 14:22:03 +0800
• de25bf7e4b Merge branch 'dev' into order 刘嘉炜 2021-10-26 09:56:53 +0800
• 771e5dc247 fix book modal 刘嘉炜 2021-10-26 09:56:15 +0800
• 5a9818ad8c add ym card order 刘嘉炜 2021-10-25 18:00:45 +0800
• 62066352b3 fix order 刘嘉炜 2021-10-25 14:07:45 +0800
• 63524edd7c add order 刘嘉炜 2021-10-22 18:00:35 +0800
• 5c930bed15 add order 刘嘉炜 2021-10-21 18:02:46 +0800
• ba61532a27 fix order bug 刘嘉炜 2021-10-21 14:56:38 +0800
• a85d72886a fix order 刘嘉炜 2021-10-20 18:03:17 +0800
• f703781e4f add mall order 刘嘉炜 2021-10-20 17:09:33 +0800
• 77977b1c18 add mall order 刘嘉炜 2021-10-19 18:02:02 +0800
• 51046c7723 fix all 郑锦全 2021-10-19 16:11:31 +0800
• aec2f93988 add mall order 刘嘉炜 2021-10-18 18:02:22 +0800
• 853ce527b2 fix order 刘嘉炜 2021-10-15 18:04:49 +0800
• 1e1bea179e add order api 刘嘉炜 2021-10-15 16:12:33 +0800
• a4ec24dacd add order api 刘嘉炜 2021-10-14 16:58:18 +0800
• d01a0f4b4d add api course 郑锦全 2021-10-14 09:16:22 +0800
• 9b387e0a5a add order api 刘嘉炜 2021-10-13 18:05:46 +0800
• 603e7ad4b1 add order 刘嘉炜 2021-10-12 18:01:19 +0800
• 27a49382bf add mall order 刘嘉炜 2021-10-11 18:01:41 +0800
• ed7dd7158d add mall order 刘嘉炜 2021-10-09 18:02:45 +0800
• e259a1b29c “add order 刘嘉炜 2021-10-08 18:04:05 +0800
• 992815eb3c add order 刘嘉炜 2021-10-08 18:02:33 +0800
• 7459a9022d add order 刘嘉炜 2021-09-30 17:59:10 +0800
• 04accdedf6 添加小灰熊空调控制指令 zmt 2021-09-30 14:21:32 +0800
• b5c0deff4c add order 刘嘉炜 2021-09-29 18:00:32 +0800
• f5cdce240a add order 刘嘉炜 2021-09-28 18:00:27 +0800
• 44333c8ff1 Merge branch 'dev' into order 刘嘉炜 2021-09-28 15:50:35 +0800
• 5d9442c6e8 v 1.1.10 && merge error 刘嘉炜 2021-09-28 15:48:42 +0800
• 4f24c02c95 v 1.1.10 formal 刘嘉炜 2021-09-28 15:47:46 +0800
• 9d192774fa vtest 1.1.10 刘嘉炜 2021-09-28 15:46:34 +0800
• 26a157bac6 fix storePickerChange 刘嘉炜 2021-09-28 11:08:04 +0800
• f066a7de89 add order 刘嘉炜 2021-09-27 18:01:26 +0800
• 0736504913 add order 刘嘉炜 2021-09-26 18:01:38 +0800
• bae3ccb029 add order 刘嘉炜 2021-09-24 18:01:00 +0800
• 53914a54de add course api 郑锦全 2021-09-24 16:37:55 +0800
• ce223a2d48 add course style 郑锦全 2021-09-24 15:09:28 +0800
• c6a5a5e1ac Merge branch 'dev' into order 刘嘉炜 2021-09-24 09:29:19 +0800
• 3956fbd985 Merge branch 'master' of https://git.ouxuan.net/liujw/ox_zhiNengZhuShou 刘嘉炜 2021-09-23 17:58:11 +0800
• 40fdb9f9e2 v1.1.9 formal 刘嘉炜 2021-09-23 17:56:09 +0800
• 3f08565b01 Merge branch 'dev' -> v1.1.8 formal 刘嘉炜 2021-09-23 17:52:50 +0800
• 3b3ffca328 v1.1.8 formal 刘嘉炜 2021-09-23 17:51:55 +0800
• b08d7e5ae4 vtest 1.1.9 刘嘉炜 2021-09-23 17:50:15 +0800
• 1956fd9219 add style course 郑锦全 2021-09-18 16:19:00 +0800
• 640e424106 add order modal 刘嘉炜 2021-09-18 14:58:47 +0800
• 8cd8f2b32a add value card order 刘嘉炜 2021-09-17 18:04:05 +0800
• a934f23999 add order api 刘嘉炜 2021-09-16 18:03:13 +0800
• 5f9cb35edc add order 刘嘉炜 2021-09-15 18:00:51 +0800
• e84245d3b7 Merge branch 'dev' into order 刘嘉炜 2021-09-15 17:43:01 +0800
• ec4f23cc02 add 离场方式&时间 刘嘉炜 2021-09-15 17:39:20 +0800
• d5fa1382da add order modules 刘嘉炜 2021-09-14 18:01:10 +0800
• 7f8381f931 Merge branch 'dev' into order 刘嘉炜 2021-09-14 17:30:50 +0800
• f9c6d8d50b 取消连场限制 刘嘉炜 2021-09-14 17:27:22 +0800
• 3096f37f77 add order model 刘嘉炜 2021-09-13 18:04:47 +0800
• 915b929aa9 add order list 刘嘉炜 2021-09-10 18:06:29 +0800
• b18cdc1706 fix orderList 刘嘉炜 2021-09-10 14:26:15 +0800
• 8a1904cfe6 vtest 1.1.8 刘嘉炜 2021-08-20 17:53:30 +0800
• 87a94f9bad Merge branch 'dev' 刘嘉炜 2021-08-20 17:52:19 +0800
• 34115f42f7 v1.1.8 formal 刘嘉炜 2021-08-20 17:51:24 +0800
• 04f2891be6 vtest 1.1.7 刘嘉炜 2021-08-20 17:47:43 +0800
• 6197d7682a add api admin 刘嘉炜 2021-08-20 17:46:26 +0800
• 957e24b9f1 v1.1.7 :Merge branch 'dev' zmt 2021-08-12 14:21:22 +0800
• 37dedd3dec change time pick range zmt 2021-08-12 13:31:40 +0800
• b485b94d6f v1.1.6 刘嘉炜 2021-08-09 15:54:30 +0800
• 59269ad471 v1.1.6formal 刘嘉炜 2021-08-09 15:54:13 +0800
• 117aa4b197 add tip && vtest 1.1.6 刘嘉炜 2021-08-09 15:52:23 +0800
• 315c7404a5 v1.1.5 formal 刘嘉炜 2021-08-09 15:32:07 +0800
• 2f21e93d23 v1.1.5 formal 刘嘉炜 2021-08-09 15:31:45 +0800
• e0331b5d66 fix all && vtest 1.1.5 刘嘉炜 2021-08-09 15:24:20 +0800
• a9d42c61fd fix manage 刘嘉炜 2021-08-06 18:07:19 +0800
• d58080b976 场地时间自动补充7天 刘嘉炜 2021-08-06 17:31:16 +0800
• 44d326b345 v1.1.4 formal 刘嘉炜 2021-08-06 16:42:28 +0800
• 8b61c5a722 v1.1.4 formal 刘嘉炜 2021-08-06 16:42:14 +0800
• 6c91eeae05 Merge branch 'dev' of https://git.ouxuan.net/APP/ox_zhiNengZhuShou into dev zmt 2021-08-06 16:13:18 +0800
• f7818d4836 add copy & change style in timing_list zmt 2021-08-06 16:13:10 +0800
• 125d11513e fix all 刘嘉炜 2021-08-06 15:40:49 +0800
• 461ad1cd8d fix all 刘嘉炜 2021-08-05 18:08:42 +0800
• 3bf1705126 Merge branch 'dev' of https://git.ouxuan.net/liujw/ox_zhiNengZhuShou into site 刘嘉炜 2021-08-04 13:31:40 +0800
• 777ae74e72 Merge branch 'dev' into voice zmt 2021-07-29 17:51:27 +0800
• 1d59690a57 8月份需求页面部分（空调，租球机），等待接口对接 zmt 2021-07-29 16:29:40 +0800
• d95af2e541 add all 刘嘉炜 2021-07-28 18:11:25 +0800
• 6ed73980ac 添加窗帘，空调，隐藏本次更新不需要的设备 zmt 2021-07-28 14:00:48 +0800
• 2599c98b0d add occupy 刘嘉炜 2021-07-27 18:04:16 +0800