Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/enterprise/modules/base/dto/WhisperingWallDTO.java

@@ -22,9 +22,9 @@ public class WhisperingWallDTO {
 
     private String questionTime;
 
-    private PersonInfo answerPersonInfo;
+    private PersonInfo questionPersonInfo;
 
-    private CompanyInfoDetailDTO answerCompanyInfoDetailDTO;
+    private CompanyInfoDetailDTO questionCompanyInfoDetailDTO;
 
     private CompanyInfoDetailDTO companyInfoDetailDTO;
 

web/src/main/java/com/jpsoft/enterprise/modules/base/controller/WhisperingWallController.java

@@ -225,7 +225,7 @@ public class WhisperingWallController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("create_time","desc"));
 
         if (StringUtils.isNotEmpty(question)) {
             searchParams.put("question","%" + question + "%");

web/src/main/java/com/jpsoft/enterprise/modules/mobile/controller/WhisperingWallApiController.java

@@ -214,8 +214,8 @@ public class WhisperingWallApiController {
             CompanyInfo companyInfo = companyInfoService.get(personInfo.getCompanyId());
             CompanyInfoDetailDTO answerCompanyInfo = new CompanyInfoDetailDTO();
             BeanUtils.copyProperties(companyInfo,answerCompanyInfo);
-            whisperingWallDTO.setAnswerPersonInfo(personInfo);
-            whisperingWallDTO.setAnswerCompanyInfoDetailDTO(answerCompanyInfo);
+            whisperingWallDTO.setQuestionPersonInfo(personInfo);
+            whisperingWallDTO.setQuestionCompanyInfoDetailDTO(answerCompanyInfo);
             whisperingWallDTO.setQuestionCompanyName(companyInfo.getCompanyName());
             whisperingWallDTO.setTypeName(whisperingWall.getTypeName());
             whisperingWallDTO.setQuestionTime(DateUtil.format(whisperingWall.getQuestionTime(),"yyyy-MM-dd"));