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

• 7c8041cd6f fix && change header 刘嘉炜 2022-09-08 14:36:50 +0800
• 430d58e8ed del index record 刘嘉炜 2022-09-06 18:02:22 +0800
• 60d68de140 add income api 刘嘉炜 2022-09-01 13:33:59 +0800
• 21e0660b32 add income api 刘嘉炜 2022-08-31 18:00:30 +0800
• 20bb5e9032 add income api 刘嘉炜 2022-08-30 16:58:36 +0800
• 5d88d474e1 add income api 刘嘉炜 2022-08-29 17:59:58 +0800
• 8ccbd25fe7 add club rental autofill amount 刘嘉炜 2022-08-04 14:33:53 +0800
• cb9a059f0c Merge branch 'dev' 刘嘉炜 2022-07-29 18:37:31 +0800
• 78071bb2eb v1.1.27 formal 刘嘉炜 2022-07-29 18:37:09 +0800
• 28611eb01d vtest 1.1.27 -- 储值卡订单、储值卡管理、租球机订单 刘嘉炜 2022-07-29 18:27:14 +0800
• 87748b996b vtest 1.1.27 刘嘉炜 2022-07-29 17:45:29 +0800
• 7ceefab19d Merge branch 'dev' of https://git.ouxuan.net/liujw/ox_zhiNengZhuShou into savings 刘嘉炜 2022-07-28 17:53:17 +0800
• ab0658b8f9 fix 租球订单 刘嘉炜 2022-07-28 17:49:06 +0800
• d8b869ec66 add rental ball order 刘嘉炜 2022-07-27 18:02:17 +0800
• 9ec425b781 fix value card 刘嘉炜 2022-07-26 17:56:48 +0800
• 0aa305419b fix index icon 刘嘉炜 2022-07-26 17:35:23 +0800
• 7885fafc8a add end balling api 刘嘉炜 2022-07-26 17:05:20 +0800
• c77d43f667 次卡订单支付方式字段修改 刘嘉炜 2022-07-26 11:00:32 +0800
• 88f873152d add stored value card 刘嘉炜 2022-07-25 17:59:29 +0800
• 257d5c31cf v 1.1.26 formal 张家华 2022-07-01 17:38:21 +0800
• 657b909b3d Merge branch 'dev' 张家华 2022-07-01 16:57:54 +0800
• e6fc485bcb Merge branch 'feat-retail' into dev 张家华 2022-07-01 14:10:59 +0800
• 5754485806 retail fix 张家华 2022-07-01 14:10:20 +0800
• e8a04e7dae Merge branch 'feat-retail' into dev 张家华 2022-06-30 17:07:36 +0800
• da6a236f5c 零售订单退款字段修改 张家华 2022-06-30 17:07:07 +0800
• 8b14a5c839 Merge branch 'feat-retail' into dev 张家华 2022-06-30 10:56:46 +0800
• ebfb80f1c2 update 张家华 2022-06-30 10:56:15 +0800
• ccbc46c223 Merge branch 'feat-retail' into dev 张家华 2022-06-24 10:36:11 +0800
• 47150868dc retail style 张家华 2022-06-24 10:35:41 +0800
• 3e2190a0a0 Merge branch 'feat-retail' into dev 张家华 2022-06-24 09:58:43 +0800
• b5c641caaa 零售途径 张家华 2022-06-24 09:58:19 +0800
• 0de22d4c5b Merge branch 'feat-retail' into dev 张家华 2022-06-24 09:19:41 +0800
• 2c88a568ff 零售列表borderTop 张家华 2022-06-24 09:17:56 +0800
• 4f5d0595d3 Merge branch 'feat-retail' into dev 张家华 2022-06-23 15:12:43 +0800
• e565fd87d3 零售fix 张家华 2022-06-23 15:11:34 +0800
• 1c8bb2deef Merge branch 'feat-retail' into dev 张家华 2022-06-23 11:05:59 +0800
• 20c353895a 零售订单详情 张家华 2022-06-23 11:05:32 +0800
• 193bb49101 Merge branch 'feat-retail' into dev 张家华 2022-06-22 17:41:25 +0800
• e825bd72ff 零售订单详情单价修改 张家华 2022-06-22 17:40:56 +0800
• 16536795cd Merge branch 'feat-retail' into dev 张家华 2022-06-22 14:28:33 +0800
• 0a19f5770e retail-fix 张家华 2022-06-22 14:26:44 +0800
• 29c04d5d99 Merge branch 'feat-retail' into dev 张家华 2022-06-22 09:56:23 +0800
• 24b6d23cb7 retail-update 张家华 2022-06-22 09:47:32 +0800
• 2bb6815988 update 张家华 2022-06-21 17:15:57 +0800
• c461ce8154 retail update 张家华 2022-06-21 15:53:41 +0800
• 914cb3ab8f 零售订单调整 张家华 2022-06-21 15:12:33 +0800
• 5cf49633a5 零售商品页修整 张家华 2022-06-17 17:21:58 +0800
• 26ad63669a change curriclum order end time 刘嘉炜 2022-06-13 13:33:04 +0800
• 39a80c7a95 Merge branch 'dev't pull origin 刘嘉炜 2022-06-01 10:43:17 +0800
• 0c7acd6878 v 1.1.24 formal 刘嘉炜 2022-06-01 10:43:05 +0800
• b77881735a vtest 1.1.24 刘嘉炜 2022-06-01 10:30:56 +0800
• 4ac14ec8b5 Merge branch 'menu840' into dev 刘嘉炜 2022-06-01 10:29:44 +0800
• f8b7e174b8 change air contral ext 刘嘉炜 2022-05-26 16:28:01 +0800
• 646f7bab7c change air conditioner ext 刘嘉炜 2022-05-26 11:19:18 +0800
• b19132c30a add organize detail api 刘嘉炜 2022-05-20 17:59:47 +0800
• a69f892469 add organize detail 刘嘉炜 2022-05-19 18:01:06 +0800
• 4cdf2a1955 零售订单样式调整 张家华 2022-05-19 13:25:51 +0800
• d2ac2f407e 零售样式调整 张家华 2022-05-18 14:07:37 +0800
• 2fbfecf88c 零售订单管理修改 张家华 2022-05-17 15:20:48 +0800
• fb2b9f7b50 零售完善 张家华 2022-05-16 17:40:28 +0800
• 79f38d188a Merge branch 'dev' of https://git.ouxuan.net:`t/liujw/ox_zhiNengZhuShou into menu840 刘嘉炜 2022-05-16 16:20:22 +0800
• 43b401e211 add device tab author 刘嘉炜 2022-05-16 16:18:14 +0800
• 14cf8e3085 Merge branch 'dev' 刘嘉炜 2022-05-16 11:26:53 +0800
• b8241ae524 v1.1.23 formal 刘嘉炜 2022-05-16 11:26:27 +0800
• 4e46c141c1 vtest 1.1.23 刘嘉炜 2022-05-16 11:21:06 +0800
• 48e260a113 零售改版 张家华 2022-05-13 18:02:15 +0800
• 043aabc373 add index isPermissionShowTab 刘嘉炜 2022-05-13 17:58:54 +0800
• 1bdb5b14e3 硬件设备加 id参数，改接口【ID1000881】 刘嘉炜 2022-05-13 15:34:03 +0800
• 29ed5a9552 change statistics tit 刘嘉炜 2022-05-10 09:53:10 +0800
• 7999b8de6e Merge branch 'dev' 刘嘉炜 2022-05-09 18:01:55 +0800
• 6a67620fab v1.1.22 formal 刘嘉炜 2022-05-09 18:01:38 +0800
• 0e2f54e1e4 vtest 1.1.22 刘嘉炜 2022-05-09 17:57:46 +0800
• f262065878 fix statistics price unit 刘嘉炜 2022-05-09 16:57:09 +0800
• 2045cc2635 Merge branch 'statistics' into dev 刘嘉炜 2022-05-09 11:49:25 +0800
• 3fc179eecb 双门禁 ID1000881 刘嘉炜 2022-05-07 17:50:04 +0800
• 96a89c587d fix statistics 刘嘉炜 2022-05-07 17:41:09 +0800
• 5f20fb54ea add collection stadium_id_filter 刘嘉炜 2022-05-07 10:40:48 +0800
• d0ba20db33 fix statistics 刘嘉炜 2022-05-06 18:01:41 +0800
• c129056d36 fix statistics 刘嘉炜 2022-05-06 17:21:43 +0800
• c3027598f7 Merge branch 'dev' of https://git.ouxuat p:n.net/liujw/ox_zhiNengZhuShou into statistics 刘嘉炜 2022-05-06 16:16:19 +0800
• d2eb0e474a change statistics stadium ls api 刘嘉炜 2022-05-06 16:16:07 +0800
• 1ebe63ad1e change record name 刘嘉炜 2022-05-05 14:14:03 +0800
• a317561c0f fix statistics 刘嘉炜 2022-04-29 17:37:29 +0800
• 2d42740e57 change scene api 刘嘉炜 2022-04-26 16:12:23 +0800
• 9d289e953a add statistics api 刘嘉炜 2022-04-25 14:48:40 +0800
• 7b80cbdde3 add collection info 刘嘉炜 2022-04-24 17:59:46 +0800
• c8d287ee0f add statistics api 刘嘉炜 2022-04-22 17:58:59 +0800
• d3ab60db17 Merge branch 'dev' into statistics 刘嘉炜 2022-04-20 16:55:43 +0800
• c521760753 add statistics api 刘嘉炜 2022-04-20 16:55:39 +0800
• 12bec61484 fix switch manage device name 刘嘉炜 2022-04-20 16:48:29 +0800
• af8dfdc19d add data api 刘嘉炜 2022-04-15 18:00:57 +0800
• 92685c42d1 Merge branch 'all' 刘嘉炜 2022-03-31 18:04:43 +0800
• 3805356d25 v1.1.20 formal 刘嘉炜 2022-03-31 18:04:12 +0800
• bde858c5c6 vtest 1.1.20 刘嘉炜 2022-03-31 17:56:04 +0800
• a4d9b4dfd8 Merge branch 'writeoff' into all 刘嘉炜 2022-03-31 16:38:25 +0800
• a70800d87a Merge branch 'occupy' into all 刘嘉炜 2022-03-31 16:37:59 +0800
• 98f106563c fix occupy 刘嘉炜 2022-03-31 16:37:13 +0800
• 76faa0d0d3 Merge branch 'dev' of https://git.ouxuan.net/APP/ox_zhiNengZhuShou into dev 郑锦全 2022-03-31 11:14:26 +0800
• 39c74bb3e5 tapd 1000742&1000745 郑锦全 2022-03-31 11:14:17 +0800
• 3c18edeec2 add occupy 刘嘉炜 2022-03-21 17:58:06 +0800