Commit Graph

20 Commits

Author SHA1 Message Date
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
9762633ecd dish 识别 2018-10-04 20:03:10 +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
b1fd6bbdd9 改了myuser physique 2018-10-02 14:43:03 +08:00
ScorpioMiku
6293416764 体质测评 2018-10-02 14:31:29 +08:00
zhaolizhi
c438c7d21d bean 2018-09-30 19:22:22 +08:00
zhaolizhi
4097e8f435 1 2018-09-28 09:03:09 +08:00
zhaolizhi
51004fc9eb updata readme 2018-09-24 21:01:10 +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
ec41925d18 add is over 2018-09-08 21:52:16 +08:00
zhaolizhi
d173cc351e merge 2018-09-06 09:30:19 +08:00
zhaolizhi
c1a0ea6e6c design database 2018-09-06 09:25:11 +08:00
zhaolizhi
1e03292d60 Merge branch 'develop' of https://github.com/wangtianrui/NutritionMaster into develop 2018-08-28 10:33:19 +08:00
zhaolizhi
bbf1b5b398 1 2018-08-28 10:33:13 +08:00
ScorpioMiku
8b1d6a6527 需求分析 2018-08-27 23:38:26 +08:00
zhaolizhi
c16d0d6972 update dataset site 2018-08-27 17:37:43 +08:00
zhaolizhi
d02e06ad63 add a readme 2018-08-26 11:29:56 +08:00