messages_zh_CN.properties
1.67 KB
-
Merge branch 'dev_20201208_hiring' into dev · c093005b# Conflicts: # yd-api/src/main/java/com/yd/api/agms/AgmsController.java # yd-api/src/main/resources/i18n/messages_zh_CN.properties
jianan committed
# Conflicts: # yd-api/src/main/java/com/yd/api/agms/AgmsController.java # yd-api/src/main/resources/i18n/messages_zh_CN.properties