Commit Graph

469 Commits

Author SHA1 Message Date
e55aa62bcc
一部分完成 2020-08-13 10:04:50 +08:00
c39d6ba811 Merge pull request '修改了图片' (#162) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/162
2020-08-12 15:02:18 +08:00
fb3713093f Merge branch 'master' into xbx 2020-08-12 15:02:12 +08:00
e8f46674c4
修改了图片 2020-08-12 15:01:11 +08:00
b85ab380ef Merge pull request 'mine history 8.12' (#161) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/161
2020-08-12 11:45:38 +08:00
87185d7d0f mine history 8.12 2020-08-12 11:45:12 +08:00
22cdf3e415 Merge pull request 'xbx' (#160) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/160
2020-08-12 11:33:44 +08:00
ab4e50a9ae
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-12 11:33:34 +08:00
d2c6bcb1bc
列表刷新 2020-08-12 10:43:47 +08:00
1d48546424 Merge pull request 'show price 8.12' (#159) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/159
2020-08-12 10:16:51 +08:00
d8d3434988 show price 8.12 2020-08-12 10:16:14 +08:00
083153929b Merge pull request 'show price 8.12' (#158) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/158
2020-08-12 10:13:21 +08:00
d19771b182 show price 8.12 2020-08-12 10:10:59 +08:00
a45db4afbf
赋值page1 2020-08-12 09:32:02 +08:00
gyh
1db45d40a7 Merge pull request 'gdpaoup' (#157) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/157
2020-08-11 22:18:08 +08:00
Gdpao
ef79718190 gdpaoup 2020-08-11 22:15:58 +08:00
91ca2fdd19 Merge pull request 'xbx' (#156) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/156
2020-08-11 18:28:08 +08:00
0e7139bc16
红点 这找曾 2020-08-11 18:27:19 +08:00
3acaf94a37 Merge pull request 'fixing bug 8.11' (#155) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/155
2020-08-11 18:25:29 +08:00
523dadd55d fixing bug 8.11 2020-08-11 18:24:56 +08:00
693048f1ab
Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-08-11 16:03:48 +08:00
f9fa80665b
默认 2020-08-11 16:03:12 +08:00
cb178c1407 Merge pull request 'zhy' (#154) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/154
2020-08-11 15:59:14 +08:00
9a0dc4c6d1 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-08-11 15:40:53 +08:00
1ef4db7dc4 fixing bug 8.11 2020-08-11 15:39:56 +08:00
37d8ab7a2b fixing bug 8.11 2020-08-11 15:38:43 +08:00
gyh
20259ddf00 Merge pull request 'gdpaomg1' (#153) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/153
2020-08-11 11:13:04 +08:00
Gdpao
703689d272 gdpaomg1 2020-08-11 11:12:32 +08:00
gyh
6c724d4f4c Merge pull request 'gdpaoup' (#152) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/152
2020-08-11 10:36:48 +08:00
Gdpao
b3a7b2d032 Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into gyh 2020-08-11 10:36:18 +08:00
Gdpao
b34ac35821 gdpaoup 2020-08-11 10:35:01 +08:00
def8f0cf1b Merge pull request 'xbx' (#151) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/151
2020-08-11 10:26:19 +08:00
6984ea9374
消息 2020-08-11 10:25:41 +08:00
39b2749ac9 Merge pull request 'zhy' (#150) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/150
2020-08-11 10:23:43 +08:00
c01470b52d fixing bug 8.11 2020-08-11 10:23:04 +08:00
6e900dcd3b Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy 2020-08-11 10:10:13 +08:00
7956517c4a solve bug 8.11 2020-08-11 10:06:51 +08:00
gyh
43e15cc4a7 Merge pull request 'gdpao' (#149) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/149
2020-08-11 10:04:46 +08:00
Gdpao
e1c908152a gdpao 2020-08-11 10:04:25 +08:00
Gdpao
aad2bca5c6 gdpao 2020-08-11 10:00:06 +08:00
f79db4aa62 Merge pull request 'fixed bug 8.11' (#147) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/147
2020-08-11 09:46:49 +08:00
4739ef71a9 fixed bug 8.11 2020-08-11 09:46:05 +08:00
a22b3fba71
图片 2020-08-11 09:36:03 +08:00
gyh
003bc07c6b Merge pull request 'gdpao' (#146) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/146
2020-08-10 19:19:54 +08:00
Gdpao
e6f73f01cd gdpao 2020-08-10 19:19:29 +08:00
gyh
52bce327cc Merge pull request 'gdpaoup' (#145) from gyh into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/145
2020-08-10 19:08:19 +08:00
Gdpao
74fcc50696 gdpaoup 2020-08-10 19:06:47 +08:00
33b0137c06 Merge pull request 'zhy' (#144) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/144
2020-08-10 17:47:31 +08:00
7c05459daf send wash 8.9 2020-08-10 17:46:57 +08:00
610d012e67 Merge pull request 'xbx' (#143) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/143
2020-08-10 17:39:14 +08:00