179 Commits

Author SHA1 Message Date
ScorpioMiku
92ee55ad2d Update ClassifierCamera.java 2020-12-15 16:55:02 +08:00
ScorpioMiku
b8507aa536 Update ConstantUtils.java 2020-12-15 16:52:37 +08:00
ScorpioMiku
1c55b40f9e Update README.md 2020-07-15 09:15:02 +08:00
ScorpioMiku
a5e5c526a9 Update README.md 2019-12-17 08:18:32 +08:00
ScorpioMiku
f9ed1012f2 Merge branch 'jiangyuwei' 2019-03-04 21:25:37 +08:00
ScorpioMiku
d140116e1f Merge branch 'jiangyuwei' of https://github.com/wangtianrui/NutritionMaster into jiangyuwei 2019-03-04 21:25:16 +08:00
ScorpioMiku
a36b92d7f2 Merge branch 'master' of https://github.com/wangtianrui/NutritionMaster 2019-03-04 21:22:25 +08:00
ScorpioMiku
e86e8c4c4e Merge branch 'master' of https://github.com/wangtianrui/NutritionMaster 2019-03-04 21:15:26 +08:00
ScorpioMiku
f935532b22 README 2019-03-04 21:14:55 +08:00
ScorpioMiku
5bcb752a6b README 2019-03-04 21:12:37 +08:00
ScorpioMiku
af70737e6e Merge branch 'master' of https://github.com/wangtianrui/NutritionMaster 2019-03-04 21:10:26 +08:00
ScorpioMiku
deefa86cd3 Merge branch 'jiangyuwei' of https://github.com/wangtianrui/NutritionMaster into jiangyuwei 2019-03-04 21:09:47 +08:00
ScorpioMiku
be3abe90b1 Merge branch 'jiangyuwei' of https://github.com/wangtianrui/NutritionMaster into jiangyuwei 2019-03-04 21:01:25 +08:00
jiangyuwei666
e9f7839348 1 2019-03-04 20:57:51 +08:00
jiangyuwei666
f207ad2768 1 2019-03-04 20:52:56 +08:00
jiangyuwei666
d8ae182023 web server done 2019-03-04 20:45:43 +08:00
jiangyuwei666
87c2335b4c 1 2019-03-04 20:36:58 +08:00
jiangyuwei666
711494fdd0 1 2019-03-04 20:32:33 +08:00
ScorpioMiku
8f8a98a775 ui 2019-03-01 17:18:51 +08:00
ScorpioMiku
028fc613b8 1 2018-11-12 20:46:24 +08:00
ScorpioMiku
9708b65292 bug 2018-11-09 20:44:37 +08:00
ScorpioMiku
31d3171102 1 2018-11-09 18:56:06 +08:00
ScorpioMiku
a0d34e04d9 1 2018-11-09 10:13:50 +08:00
ScorpioMiku
a19f3347b7 1 2018-11-09 08:45:29 +08:00
ScorpioMiku
18d04a3a78 baidu 2018-11-08 13:13:03 +08:00
ScorpioMiku
a02323d7be wang 2018-11-08 12:50:48 +08:00
ScorpioMiku
a5acd866c6 history 2018-11-08 12:49:52 +08:00
ScorpioMiku
a7dd7fb69c wang 2018-11-08 00:56:56 +08:00
ScorpioMiku
57b9bcfd4c wang 2018-11-08 00:49:15 +08:00
ScorpioMiku
ae3451f4ca Merge branch 'develop' of https://github.com/wangtianrui/NutritionMaster into develop 2018-11-07 22:01:29 +08:00
ScorpioMiku
bcb948de95 wang 2018-11-07 22:01:19 +08:00
zhaolizhi
d79cf541aa Merge branch 'develop' of https://github.com/wangtianrui/NutritionMaster into develop 2018-11-07 19:43:50 +08:00
zhaolizhi
a0db58816b history 2018-11-07 19:43:38 +08:00
ScorpioMiku
0b1f2d9772 1 2018-11-07 17:36:14 +08:00
ScorpioMiku
bb0292f484 食材组合搜索ok 2018-11-07 17:17:41 +08:00
ScorpioMiku
5dbfe25238 1 2018-11-07 15:38:04 +08:00
ScorpioMiku
326dcbf7a0 1 2018-11-05 21:34:41 +08:00
ScorpioMiku
eb75d2945a 1 2018-11-05 20:39:40 +08:00
ScorpioMiku
a954624abe Merge branch 'develop' of https://github.com/wangtianrui/NutritionMaster into develop 2018-11-05 20:32:30 +08:00
ScorpioMiku
f040a45c5a develop 2018-11-05 20:32:20 +08:00
zhaolizhi
51d2bf95dc 1 2018-11-05 20:28:18 +08:00
ScorpioMiku
7d0037e10c develop 2018-11-05 20:27:01 +08:00
ScorpioMiku
1e15caa3dc wang 2018-11-05 20:25:41 +08:00
ScorpioMiku
d12c53f519 1 2018-11-05 20:17:42 +08:00
zhaolizhi
635b7c0289 readme 2018-11-03 10:47:08 +08:00
zhaolizhi
f0fd84553b readme 2018-11-02 21:04:07 +08:00
zhaolizhi
972dcccb88 1 2018-11-02 20:16:55 +08:00
zhaolizhi
814a335fd0 readme 2018-11-02 15:08:34 +08:00
zhaolizhi
000246671d Merge branch 'develop' of https://github.com/wangtianrui/NutritionMaster into develop 2018-10-31 11:47:54 +08:00
zhaolizhi
de72ed5abd 1 2018-10-31 11:47:34 +08:00