Commit Graph

110 Commits

Author SHA1 Message Date
ScorpioMiku
d12c53f519 1 2018-11-05 20:17:42 +08:00
ScorpioMiku
9858485c47 小细节 2018-10-06 21:58:07 +08:00
ScorpioMiku
4d979725cb 1 2018-10-06 21:44:44 +08:00
ScorpioMiku
1817d66cc5 single classify 2018-10-06 17:55:42 +08:00
ScorpioMiku
dd780cdb72 1 2018-10-06 16:38:36 +08:00
ScorpioMiku
73cb1db3d8 Merge branch 'develop' into wangtianrui 2018-10-06 14:33:59 +08:00
ScorpioMiku
1752f13d61 1 2018-10-06 14:31:59 +08:00
ScorpioMiku
dafcf5583e 1 2018-10-06 14:11:03 +08:00
zhaolizhi
861d76d4cc webutil 2018-10-06 13:27:09 +08:00
zhaolizhi
1ea891f765 webutil 2018-10-06 13:20:26 +08:00
ScorpioMiku
164beaef04 1 2018-10-05 21:02:47 +08:00
ScorpioMiku
ccd3e0633c 1 2018-10-05 19:10:54 +08:00
ScorpioMiku
c49044a0f6 merge的bug改完了 2018-10-05 16:03:01 +08:00
ScorpioMiku
6c6ae71d64 Merge branch 'wangtianrui' into develop 2018-10-05 15:32:56 +08:00
ScorpioMiku
9aa0625e67 1 2018-10-05 15:27:29 +08:00
ScorpioMiku
5db14fcf04 result 2018-10-05 14:25:49 +08:00
ScorpioMiku
92f4b56f64 1 2018-10-05 12:31:44 +08:00
ScorpioMiku
9762633ecd dish 识别 2018-10-04 20:03:10 +08:00
ScorpioMiku
1b3ac3c501 access 2018-10-04 15:25:27 +08:00
zhaolizhi
80869c4c7f util 2018-10-02 21:03:36 +08:00
zhaolizhi
45030adc91 utils 2018-10-02 21:00:08 +08:00
ScorpioMiku
1612b9f7ea Merge branch 'wangtianrui' into develop 2018-10-02 17:15:47 +08:00
ScorpioMiku
886cb247af 1 2018-10-02 16:51:39 +08:00
ScorpioMiku
fb4654e24a 体质测试UI bug改好了 2018-10-02 16:45:41 +08:00
ScorpioMiku
47aea25966 1 2018-10-02 15:57:44 +08:00
ScorpioMiku
83406a8e0b 1 2018-10-02 15:41:12 +08:00
ScorpioMiku
b1fd6bbdd9 改了myuser physique 2018-10-02 14:43:03 +08:00
ScorpioMiku
6293416764 体质测评 2018-10-02 14:31:29 +08:00
ScorpioMiku
fd225f4da2 体质测评完成 2018-10-02 11:43:48 +08:00
ScorpioMiku
7c4bbb2f27 information bar 2018-10-01 16:20:51 +08:00
ScorpioMiku
e8a1ef4066 information bar 2018-10-01 16:19:24 +08:00
ScorpioMiku
a0483f33e6 个人信息添加 2018-10-01 14:26:58 +08:00
ScorpioMiku
660320d900 1 2018-09-30 22:02:25 +08:00
zhaolizhi
c438c7d21d bean 2018-09-30 19:22:22 +08:00
ScorpioMiku
0dcde3dad8 9-30 2018-09-30 18:56:40 +08:00
zhaolizhi
4097e8f435 1 2018-09-28 09:03:09 +08:00
ScorpioMiku
b5bccec04a data 2018-09-27 20:48:19 +08:00
ScorpioMiku
52fd782c5d datas 2018-09-26 22:13:36 +08:00
ScorpioMiku
b1e145b895 Merge branch 'develop' of https://github.com/wangtianrui/NutritionMaster into develop 2018-09-25 22:13:29 +08:00
ScorpioMiku
84c014f667 okhttp 2018-09-25 22:13:01 +08:00
zhaolizhi
5665910305 random menu 2018-09-25 16:45:43 +08:00
zhaolizhi
734a2de0f3 webutils 2018-09-25 15:36:40 +08:00
ScorpioMiku
4111626670 Merge branch 'wangtianrui' into develop 2018-09-24 21:14:25 +08:00
ScorpioMiku
f4fc6039f4 customization 2018-09-24 21:14:00 +08:00
zhaolizhi
51004fc9eb updata readme 2018-09-24 21:01:10 +08:00
ScorpioMiku
ced1e200fd Merge branch 'develop' of https://github.com/wangtianrui/NutritionMaster into develop 2018-09-24 15:59:40 +08:00
ScorpioMiku
335be670bc 无限加载Bug解决 2018-09-24 15:59:05 +08:00
zhaolizhi
52a25ac1fd Merge branch 'develop' into zhaolizhi 2018-09-23 11:51:14 +08:00
zhaolizhi
eee387cba7 web done 2018-09-23 11:46:56 +08:00
ScorpioMiku
6e60f7a338 1 2018-09-21 21:02:59 +08:00