Commit Graph

Select branches

Hide Pull Requests

account

course

dev

feat-230721

gongyingshang

master

md0726

organize

privacy

tid1509

tid1731

tid1867

tid1878

voice

voice08

v1.1.30

Mono Color

• ce81ed6abc add img 刘嘉炜 2022-03-18 17:07:14 +0800
• 003885e544 Merge branch 'dev' into writeofft pus:w 刘嘉炜 2022-03-18 11:00:23 +0800
• 7996618bc9 add collection 刘嘉炜 2022-03-17 18:00:36 +0800
• 34246f4285 add collection 刘嘉炜 2022-03-16 18:01:15 +0800
• ea78a11e2b add collection list 刘嘉炜 2022-03-15 18:01:06 +0800
• 8f2b50958b fix cancel btn 刘嘉炜 2022-03-14 17:59:59 +0800
• 34b04f6623 Merge branch 'dev' 刘嘉炜 2022-03-14 10:58:31 +0800
• f76ac33e3b v 1.1.19 formal 刘嘉炜 2022-03-14 10:58:11 +0800
• e80e6d6d68 vtest 1.1.19 刘嘉炜 2022-03-10 13:57:27 +0800
• d632fee778 fix site manage 刘嘉炜 2022-03-09 16:30:34 +0800
• b846994e30 Merge branch 'master' of https://git.ouxuan.net/liujw/ox_zhiNengZhuShou 刘嘉炜 2022-03-09 14:02:34 +0800
• cc21275cad merge clash err 刘嘉炜 2022-03-09 14:02:24 +0800
• 09a9196726 v 1.1.18 formal 刘嘉炜 2022-03-09 13:28:15 +0800
• ad9246e52f vtest 1.1.18 刘嘉炜 2022-03-09 13:24:57 +0800
• d58e767d6c fix ipt&btn 刘嘉炜 2022-03-08 17:58:09 +0800
• 20a132e1bb events order 刘嘉炜 2022-02-25 18:00:18 +0800
• 507a333e51 add write off success 刘嘉炜 2022-02-23 18:01:45 +0800
• 4b01d5c874 add write off success 刘嘉炜 2022-02-22 18:01:18 +0800
• f31523089e add write off events 刘嘉炜 2022-02-18 18:00:58 +0800
• 2d77fe2ee8 del file 刘嘉炜 2022-02-17 17:59:48 +0800
• 5a4700c75a v1.1.17.1 Merge branch 'master' of https://git.ouxuan.net/APP/ox_zhiNengZhuShou zmt 2022-01-23 11:43:47 +0800
• 300c65a914 v1.1.17 Merge branch 'dev' zmt 2022-01-23 11:37:02 +0800
• 2defd812e1 v1.1.17 zmt 2022-01-23 11:36:38 +0800
• 33b555a9d7 Merge branch 'dev' of https://git.ouxuan.net/APP/ox_zhiNengZhuShou into dev zmt 2022-01-22 11:45:11 +0800
• 8cca1cd70b 与后台管理端同步添加新的tcp状态解析 zmt 2022-01-22 11:45:02 +0800
• 8baede16cd fix choose icon 刘嘉炜 2022-01-21 10:09:57 +0800
• e4df9d1139 fix mall write off 刘嘉炜 2022-01-18 14:20:08 +0800
• 74e3fad077 Merge branch 'dev' 刘嘉炜 2022-01-07 17:43:01 +0800
• fb5d1262c2 v1.1.16 formal 刘嘉炜 2022-01-07 17:41:38 +0800
• 9c87427a23 vtest 1.1.16 刘嘉炜 2022-01-07 17:37:46 +0800
• 3ce2b0ec28 fix checkLinkageVenue 刘嘉炜 2022-01-04 17:08:41 +0800
• 0cec1764df del refund btn 刘嘉炜 2022-01-04 10:37:53 +0800
• d1c52453d0 vtest 1.1.14 刘嘉炜 2022-01-04 09:43:08 +0800
• b4a6f63ccd pull err 刘嘉炜 2021-12-31 18:12:12 +0800
• ca9545ec1b v 1.1.14 merge err 刘嘉炜 2021-12-31 18:10:55 +0800
• 5965759456 v 1.1.14 刘嘉炜 2021-12-31 18:07:50 +0800
• bd2cff236e Merge branch 'writeoff' into all 刘嘉炜 2021-12-31 11:21:05 +0800
• 7a01df9cd1 Merge branch 'dev' into all 刘嘉炜 2021-12-31 11:20:49 +0800
• dd7d432fca fix search result 刘嘉炜 2021-12-31 11:07:24 +0800
• b85d5b784d Merge branch 'writeoff' into all 刘嘉炜 2021-12-30 15:23:04 +0800
• 95371469c7 add mall write off ls 刘嘉炜 2021-12-30 15:22:26 +0800
• f89e226316 v1.1.15 master Merge branch 'dev' zmt 2021-12-30 13:39:32 +0800
• 8412c3ad51 Merge branch 'master' of https://git.ouxuan.net/APP/ox_zhiNengZhuShou zmt 2021-12-30 13:38:24 +0800
• ef83f64912 v1.1.15 dev Merge branch 'dev' of https://git.ouxuan.net/APP/ox_zhiNengZhuShou into dev zmt 2021-12-30 13:36:24 +0800
• af47db0998 云中控兼容-fix zmt 2021-12-30 13:36:02 +0800
• 674150f34f Merge branch 'writeoff' into all 刘嘉炜 2021-12-30 10:27:34 +0800
• 063ab7feed Merge branch 'sitemanage' into all 刘嘉炜 2021-12-30 10:27:22 +0800
• 0f49147700 Merge branch 'author' into all 刘嘉炜 2021-12-30 10:27:11 +0800
• 03d33c89be add people change 刘嘉炜 2021-12-29 17:37:45 +0800
• a5981ef395 add writeoff 刘嘉炜 2021-12-28 18:02:00 +0800
• b03e919e1d add write off 刘嘉炜 2021-12-27 17:00:11 +0800
• 1a240afa21 add style 刘嘉炜 2021-12-24 18:02:33 +0800
• a59c804361 Merge branch 'dev' into writeoff 刘嘉炜 2021-12-24 16:37:29 +0800
• 7155138198 add digit ipt 刘嘉炜 2021-12-24 15:15:05 +0800
• 2e0d638664 删除&优化权限 刘嘉炜 2021-12-23 16:23:13 +0800
• e911db9cdf 云中控兼容-照明 zmt 2021-12-22 17:26:16 +0800
• 02286c80c3 add mall write off 刘嘉炜 2021-12-22 16:30:23 +0800
• f9ef9537bd add writeoff 刘嘉炜 2021-12-21 16:57:51 +0800
• 6e196aeb98 change linkage methods 刘嘉炜 2021-12-21 10:50:42 +0800
• f2d7cfdd12 修改照明开关灯 zmt 2021-12-17 16:57:41 +0800
• 9a90e9ef80 formal 张家华 2021-12-16 13:38:45 +0800
• 2164bf6ee9 零售文案修改 张家华 2021-12-16 11:51:54 +0800
• 0cae652ee8 add linkage 刘嘉炜 2021-12-08 16:48:26 +0800
• 6728510d51 add site scroll 刘嘉炜 2021-12-07 18:00:00 +0800
• 14cedde3f3 Merge branch 'dev' 刘嘉炜 2021-12-01 17:31:22 +0800
• cb85a5d5ca v1.1.14 formal 刘嘉炜 2021-12-01 17:31:01 +0800
• 562e247f51 vtest 1.1.14 刘嘉炜 2021-12-01 17:27:25 +0800
• 6f821a38a1 fix order search 刘嘉炜 2021-12-01 15:38:33 +0800
• 0441f87184 del api empty 刘嘉炜 2021-12-01 14:27:00 +0800
• 5cefcbd8d5 v1.1.13 formal&&merge clash 刘嘉炜 2021-11-30 17:44:33 +0800
• e583eab868 v1.1.13 formal 刘嘉炜 2021-11-30 17:41:02 +0800
• d58321adfa vtest 1.1.13 刘嘉炜 2021-11-30 15:29:18 +0800
• 82852e5131 Merge branch 'ymorder' into localbranch 刘嘉炜 2021-11-29 17:50:08 +0800
• 135eba72d5 change ym record 刘嘉炜 2021-11-29 17:49:18 +0800
• 284fbafbbe Merge branch 'ymorder' into localbranch 刘嘉炜 2021-11-29 17:02:42 +0800
• 6b67eb5299 fix img preview 刘嘉炜 2021-11-29 17:01:20 +0800
• 2588fd57df Merge branch 'ymorder' into localbranch 刘嘉炜 2021-11-29 16:41:19 +0800
• 9bf7660b9e fix ymcar 刘嘉炜 2021-11-29 16:40:49 +0800
• e874125352 vtest 1.1.12 刘嘉炜 2021-11-26 14:39:49 +0800
• 4617cf1f48 merge ymorder clash 刘嘉炜 2021-11-26 14:36:42 +0800
• 5d296a4337 Merge branch 'retail' into localbranch 刘嘉炜 2021-11-26 14:25:28 +0800
• 10896c6dec add air detail verdict 刘嘉炜 2021-11-26 14:24:47 +0800
• 736f74e921 add air style 刘嘉炜 2021-11-23 18:00:47 +0800
• 38c05dd475 add air contral 刘嘉炜 2021-11-22 18:15:03 +0800
• 4e3c7a1402 merge api zmt 2021-11-22 13:31:49 +0800
• 9c974fb9ef add xiaohuixiong zmt 2021-11-22 13:27:21 +0800
• 20faac0841 fix ymorder confirm 刘嘉炜 2021-11-18 17:59:07 +0800
• 4f22beced7 add retail order 刘嘉炜 2021-11-18 15:05:48 +0800
• 44dba590be fix gate name 刘嘉炜 2021-11-18 13:35:18 +0800
• 110bac6be1 add img preview 刘嘉炜 2021-11-17 18:00:41 +0800
• e7d9b819e4 Merge branch 'dev' into ymorder 刘嘉炜 2021-11-17 15:54:55 +0800
• 5a5b63153f add site fix name 刘嘉炜 2021-11-17 15:50:22 +0800
• 430b419e3d add&fix ymorder 刘嘉炜 2021-11-17 15:04:19 +0800
• 274762d323 add ym write off 刘嘉炜 2021-11-16 18:01:32 +0800
• b7fbd5d5cd add ym card 刘嘉炜 2021-11-15 18:00:55 +0800
• 2826bf1b75 add ymcard 刘嘉炜 2021-11-12 18:00:31 +0800
• 07e9e45e9d Merge branch 'dev' into ymorder 刘嘉炜 2021-11-12 14:22:09 +0800
• e2bca46922 add author 刘嘉炜 2021-11-05 18:00:36 +0800
• 9cbee1e4e4 add account modal 刘嘉炜 2021-11-05 11:50:58 +0800
• 3fd6dfe75c fix site manage time 刘嘉炜 2021-11-04 11:44:33 +0800