aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/3.0' into dev/dev

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/common/constant/CommonConstant.java
#	src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
#	src/main/java/com/ai/da/controller/PortfolioController.java
#	src/main/java/com/ai/da/model/dto/QueryPortfolioPageDTO.java
#	src/main/java/com/ai/da/service/PortfolioService.java
#	src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
#	src/main/resources/messages_en.properties
#	src/main/resources/messages_zh.properties
This commit is contained in:
xupei
2024-10-10 23:26:20 +08:00
parent 5098f6f4a1 c439f41d69
commit e684c4e547
272 changed files with 362 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/messages_zh.properties
View File

@@ -140,6 +140,8 @@ subscription.success=关注成功
unsubscribe.success=取消关注成功
you.have.not.followed.the.current.user=您还未关注当前用户
remaining.modifications=剩余修改次数为0
you.have.participated.in.the.event=您已经参与活动。
only.original.works.can.participate.in.the.event=抱歉，只有原创作品能参与活动。
# 可能会报异常
# Informative: