DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-18 05:25:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve merge conflict between editBuildGradle and main

Browse source
This commit is contained in:
stella-03 2025-04-27 15:09:23 +08:00
commit ecb548d0b2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/springframework/samples/petclinic/owner/Owner.java
View file

@ -57,7 +57,7 @@ public class Owner extends Person {
@Column(name = "telephone") @Column(name = "telephone")
@NotBlank @NotBlank
@Pattern(regexp = "\\d{10}", message = "{telephone.invalid}") @Pattern(regexp = "\\d{10}", message = "Please enter a valid 10-digit phone number!")
private String telephone; private String telephone;
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)

2
src/main/scss/header.scss
View file

@ -1,5 +1,5 @@
.navbar { .navbar {
border-top: 4px solid #6db33f; border-top: 10px solid #d08c27;
background-color: #34302d; background-color: #34302d;
margin-bottom: 0px; margin-bottom: 0px;
border-bottom: 0; border-bottom: 0;