Merge branch 'master' of http://git.myitsol.com/hanv/service-campaign

src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java

@@ -2140,6 +2140,7 @@ public class CustomerServiceImpl implements CustomerService {
             StringBuilder sb = new StringBuilder();
             sb.append(" select distinct name value, field_option_value_id key from customize_field_option_value");
             sb.append(" where field_option_id = :p_field_id");
+            sb.append(" order by name");
 
             params.put("p_field_id", campaignCustomerDTO.getField());