branch3
main
沈嘉昊合并到主
# Conflicts: # springbootpt9c5/src/main/java/com/annotation/APPLoginUser.java
# Conflicts: # springbootpt9c5/src/main/java/com/annotation/APPLoginUser.java # springbootpt9c5/src/main/java/com/entity/HuodongbaomingEntity.java # springbootpt9c5/src/main/java/com/entity/HuodongleixingEntity.java # springbootpt9c5/src/main/java/com/entity/HuodongtongzhiEntity.java # springbootpt9c5/src/main/java/com/entity/HuodongxindeEntity.java # springbootpt9c5/src/main/java/com/entity/model/HuodongbaomingModel.java # springbootpt9c5/src/main/java/com/entity/model/HuodongxindeModel.java # springbootpt9c5/src/main/java/com/entity/model/HuodongxinxiModel.java # springbootpt9c5/src/main/java/com/entity/model/ZhiyuanzheModel.java # springbootpt9c5/src/main/java/com/service/impl/CommonServiceImpl.java # springbootpt9c5/src/main/java/com/service/impl/HuodongbaomingServiceImpl.java # springbootpt9c5/src/main/java/com/service/impl/HuodongleixingServiceImpl.java # springbootpt9c5/src/main/java/com/service/impl/HuodongtongzhiServiceImpl.java # springbootpt9c5/src/main/java/com/service/impl/HuodongxindeServiceImpl.java # springbootpt9c5/src/main/java/com/service/impl/HuodongxinxiServiceImpl.java
c354693ba0
No due date set.
No dependencies set.
Deleting a branch is permanent. It CANNOT be undone. Continue?
沈嘉昊合并到主
c354693ba0into main 1 year agoc354693ba0.