Merge branch 'develop' of http://192.168.9.26/platform/finance_serv into develop

code/finance_serv/src/main/java/com/vion/financial/service/imp/CustomerServiceImpl.java

@@ -31,7 +31,7 @@ public class CustomerServiceImpl implements CustomerService {
 		try {
 			if(customerMapper.queryCustomer()!=null) {
 				for(Customer cus:customerMapper.queryCustomer()) {
-					if(cus.getCustomer_name()==customer.getCustomer_name()) {
+					if(cus.getCustomer_name().equals(customer.getCustomer_name())) {
 					failCode.setEcode("600");
 					failCode.setEnote("重复数据");
 					return failCode;  

code/finance_serv/src/main/java/com/vion/financial/service/imp/ProjectServiceImpl.java

@@ -31,7 +31,7 @@ public class ProjectServiceImpl implements ProjectService {
 		try {
 			if(projectMapper.queryProject()!=null) {
 			for(Project pro:projectMapper.queryProject()) {
-				if(pro.getProject_name()==project.getProject_name()) {
+				if(pro.getProject_name().equals(project.getProject_name())) {
 				failCode.setEcode("600");  
 				failCode.setEnote("重复数据");
 				return failCode;