Merge branch 'dev/dev' into dev/dev_xp

# Conflicts:
#	src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
#	src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
#	src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
#	src/main/resources/application-dev.properties
#	src/main/resources/messages_en.properties
#	src/main/resources/messages_zh.properties

src/main/resources/messages_en.properties

@@ -186,6 +186,17 @@ TROUSERS=Trousers
 SKIRT=Skirt
 FEMALE=Women's wear
 MALE=Men's wear
+
 SLOGAN=Slogan
 LOGO=Logo
-PATTERN=Pattern
+PATTERN=Pattern
+
+EMBROIDERY=Embroidery
+BEADING=Beading
+PEARL=Pearl
+RIVET=Rivet
+BUTTON=Button
+BELT=Belt
+CORSAGE=Corsage
+ZIPPER=Zipper
+POCKET=Pocket