lyw
|
d937cc5391
|
lyw 上传
|
5 months ago |
liup
|
c28d549480
|
Merge branch 'master-new-炒锅' of http://10.2.1.24:10244/fyf/AndroidSmartClient into master-new-炒锅
# Conflicts:
# app/src/main/res/layout/fragment_cloud_goods.xml
# app/src/main/res/layout/fragment_home_foods.xml
|
5 months ago |
liup
|
ad7313fa24
|
上传功能修改
|
5 months ago |
lyw
|
1c4dc91231
|
lyw 上传
|
5 months ago |
lyw
|
ead5d0142e
|
lyw 上传
|
5 months ago |
lyw
|
96e0ae4bfb
|
lyw 上传
|
5 months ago |
lyw
|
8ba3214fd3
|
lyw 上传
|
5 months ago |
liup
|
cca4acea7f
|
Merge branch 'master-new-炒锅' of http://10.2.1.24:10244/fyf/AndroidSmartClient into master-new-炒锅
# Conflicts:
# app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/CookingSimulatedActivity.java
# app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/systeminternetfragment.java
|
5 months ago |
lyw
|
7c356a547a
|
lyw 上传
|
5 months ago |
liup
|
cc932efdae
|
修改
|
5 months ago |
lyw
|
fcb1717526
|
lyw 上传
|
5 months ago |
liup
|
b0b2106353
|
同步数据修改
|
5 months ago |
liup
|
7bc512be54
|
上传功能修改
|
5 months ago |
liup
|
aecb1f272c
|
修改设备号
|
5 months ago |
liup
|
43da9b0c30
|
合并master修改
|
5 months ago |
liup
|
63ffebae72
|
Merge branch 'master' of http://10.2.1.24:10244/fyf/AndroidSmartClient into master-new-炒锅
# Conflicts:
# app/src/main/java/com/bonait/bnframework/business/UpDataModel.java
# app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigation2Activity.java
|
5 months ago |
liup
|
c44d2f5e1a
|
修改
|
5 months ago |
pry
|
7e866e0799
|
商品批量上传修改
|
5 months ago |
liup
|
3b9bb33dff
|
菜品上传功能
|
5 months ago |
pry
|
34ff65be8f
|
主界面状态显示修改
|
5 months ago |
liup
|
f13e3c75ea
|
修改菜谱分类
|
5 months ago |
pry
|
92956c5a55
|
物料同步修改
|
5 months ago |
pry
|
f82abe5e70
|
Merge remote-tracking branch 'origin/master'
|
5 months ago |
pry
|
2b1e461722
|
物料同步修改
|
5 months ago |
liup
|
7800ab8586
|
提交
|
5 months ago |
liup
|
451804392e
|
Merge branch 'master' of http://10.2.1.24:10244/fyf/AndroidSmartClient
|
5 months ago |
liup
|
c3094644c8
|
数据库批量操作
|
5 months ago |
pry
|
4a0a579a61
|
物料同步修改
|
5 months ago |
pry
|
3450a10e94
|
物料同步修改
|
5 months ago |
pry
|
d7f67fad49
|
物料同步修改
|
5 months ago |
pry
|
33d924b40f
|
Merge remote-tracking branch 'origin/master'
|
5 months ago |
pry
|
687c423101
|
一拖二商品同步修改
|
5 months ago |
liup
|
cb8201b7be
|
修复工序模型重复问题
|
5 months ago |
liup
|
bdf1ca9dda
|
修改
|
5 months ago |
liup
|
5b27d3f434
|
修改图片加载,添加维护位
|
5 months ago |
pry
|
010a625723
|
一拖二设备业务调整
|
6 months ago |
pry
|
f3fde91d1f
|
一拖二设备业务调整
|
6 months ago |
pry
|
ff923564f6
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
pry
|
f1d1bfda58
|
一拖二设备业务调整
|
6 months ago |
pry
|
adb1dfc86a
|
一拖二设备业务调整
|
6 months ago |
pry
|
a972ce7402
|
大炒配置
|
7 months ago |
fyf
|
e6972bed62
|
更新小炒程序
|
10 months ago |
fyf
|
2f837b77e3
|
41
|
10 months ago |
fyf
|
2f954b786b
|
平移轴去一号
|
10 months ago |
fyf
|
e9611468ed
|
增加深度清洁
|
10 months ago |
fyf
|
9a553f78d5
|
增加深度清洗功能
|
10 months ago |
fyf
|
10cdb5b3c0
|
333
|
10 months ago |
fyf
|
67cd135305
|
665
|
11 months ago |
fyf
|
c8663679fe
|
5
|
11 months ago |
fyf
|
5ddcf3660e
|
5555
|
11 months ago |