manage

Author	SHA1	Message	Date
赵凯迪	f938b4b4e8	update springboot/springboot/src/main/java/com/example/springboot/controller/test1.java. Signed-off-by: 赵凯迪 <2547367283@qq.com>	4 months ago
赵凯迪	d6efe2a485	Merge branch 'master' of https://gitee.com/zkdasd/managedemo1 # Conflicts: # springboot/springboot/src/main/java/com/example/springboot/controller/test1.java	4 months ago
赵凯迪	9fb0ffeccb	添加输出abc	4 months ago
赵凯迪	ed61a2aa52	添加输出789	4 months ago
赵凯迪	f6861d2d89	update springboot/springboot/src/main/java/com/example/springboot/controller/test1.java. Signed-off-by: 赵凯迪 <2547367283@qq.com>	4 months ago
赵凯迪	f9959d6e02	改回正确薪资计算方式	4 months ago
赵凯迪	52ec867a02	update springboot/springboot/src/main/java/com/example/springboot/entity/test2.java.	4 months ago
赵凯迪	374ac15c65	新增test2	4 months ago
赵凯迪	9184f8d490	frist commit	4 months ago
赵凯迪	2084901906	frist commit	4 months ago