fix the conflit in sql.
fix the conflit in sql.

Jimyhjy/GoodsManagement,Johnny-Liao/GoodsManagement,DanielInGitHub/GoodsManagement,sunshine-life/GoodsManagement,Johnny-Liao/GoodsManagement,sunshine-life/GoodsManagement,DanielInGitHub/GoodsManagement