fix bug except sku
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
Merge branch 'lujie'
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
all to fix bug in item
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
fix item edit bug
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
add sql file
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
Merge branch 'lujie'
Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'master' into Jingye.Wang

Conflicts:
	data/yincart-basic.mwb