add category
login
update
Merge branch 'master' of github.com:FerrariXX/FEJewelry

# By wuyj
# Via wuyj
* 'master' of github.com:FerrariXX/FEJewelry:
  update
  update