Merge branch 'pink' of http://39.105.160.25:10880/sifu-gogs/delivery-customer into pink

# Conflicts:
#	.eslintrc.js

.eslintrc.js

@@ -1,7 +1,7 @@
 /*
  * Eslint config file
  * Documentation: https://eslint.org/docs/user-guide/configuring/
- * Install the Eslint extension before using this feature.2
+ * Install the Eslint extension before using this feature.
  */  
 module.exports = {
   env: {