Signed-off-by: Chaozhang Xue <475990465@qq.com>
Signed-off-by: Chaozhang Xue <475990465@qq.com>
Signed-off-by: Chaozhang Xue <475990465@qq.com>
Signed-off-by: Chaozhang Xue <475990465@qq.com>
Merge branch 'jingye' of https://github.com/yincart/basic into jingye

Conflicts:
	protected/backend/runtime/application.log
Signed-off-by: Chaozhang Xue <475990465@qq.com>
Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'jingye' of https://github.com/yincart/basic into jingye
Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'master' into jingye
Merge branch 'jingye'
Signed-off-by: Chaozhang Xue <475990465@qq.com>
Merge branch 'master' into chaozhang

Conflicts:
	data/yincart-basic.mwb

Signed-off-by: Chaozhang Xue <475990465@qq.com>
Signed-off-by: Chaozhang Xue <475990465@qq.com>
Signed-off-by: Lujie Zhou <lujie.zhou@jago-ag.cn>
Merge branch 'master' into cangZhou