Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/DictController.java

 package com.gic.haoban.manage.web.controller;
 
+import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.DictDTO;
 import com.gic.haoban.manage.api.service.DictApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.vo.DictVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.Arrays;
 import java.util.List;
@@ -24,12 +27,13 @@ public class DictController extends WebBaseController {
     private DictApiService dictApiService;
 
     @RequestMapping("/dict-list")
+    @ResponseBody
     public HaobanResponse queryDictList(String dictKeys) {
         if (StringUtils.isBlank(dictKeys)) {
             return resultResponse(HaoBanErrCode.ERR_5);
         }
         String[] split = dictKeys.split(",");
         List<DictDTO> ret = dictApiService.queryList(Arrays.asList(split));
-        return resultResponse(HaoBanErrCode.ERR_1, ret);
+        return resultResponse(HaoBanErrCode.ERR_1, EntityUtil.changeEntityListByOrika(DictVo.class, ret));
     }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/DictVo.java

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created 2018/10/22.
+ *
+ * @author hua
+ */
+public class DictVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String dictName;
+
+    private String dictKey;
+
+    private String dictTitle;
+
+
+    private String dictContent;
+
+    public String getDictName() {
+        return dictName;
+    }
+
+    public void setDictName(String dictName) {
+        this.dictName = dictName;
+    }
+
+    public String getDictKey() {
+        return dictKey;
+    }
+
+    public void setDictKey(String dictKey) {
+        this.dictKey = dictKey;
+    }
+
+    public String getDictTitle() {
+        return dictTitle;
+    }
+
+    public void setDictTitle(String dictTitle) {
+        this.dictTitle = dictTitle;
+    }
+
+    public String getDictContent() {
+        return dictContent;
+    }
+
+    public void setDictContent(String dictContent) {
+        this.dictContent = dictContent;
+    }
+}