Merge remote-tracking branch 'origin/developer' into developer

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/ResourceController.java

@@ -68,9 +68,13 @@ public class ResourceController {
 
         @RequestMapping("/list-sms-sign")
         public RestResponse listSmsSign(String search) {
-            ServiceResponse<List<EnterpriseSmsSignDTO>> serviceResponse = smsApiService
+            ServiceResponse<List<EnterpriseSmsSignDTO>> response = smsApiService
                     .listSignByEnterprise(UserDetailUtils.getUserDetail().getEnterpriseId(), search);
-            return ResultControllerUtils.commonResult(serviceResponse);
+            if (response.isSuccess()) {
+                return RestResponse.success(EntityUtil.changeEntityListByJSON(EnterpriseSmsSignVO.class, response.getResult()));
+            } else {
+                return RestResponse.failure(response.getCode(), response.getMessage());
+            }
         }
 
         @RequestMapping("/save-resource")

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/EnterpriseSmsSignVO.java

+package com.gic.auth.web.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-06-10 16:37
+ */
+public class EnterpriseSmsSignVO implements Serializable {
+    private static final long serialVersionUID = 664328628311397146L;
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long signId;
+    private Integer enterpriseId;
+    private String smsSignId;
+    private String smsSignText;
+    private String smsAppid;
+    private Integer useType;
+    private Date createTime;
+    private Date updateTime;
+    private Integer deleteFlag;
+
+    public Long getSignId() {
+        return signId;
+    }
+
+    public void setSignId(Long signId) {
+        this.signId = signId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getSmsSignId() {
+        return smsSignId;
+    }
+
+    public void setSmsSignId(String smsSignId) {
+        this.smsSignId = smsSignId;
+    }
+
+    public String getSmsSignText() {
+        return smsSignText;
+    }
+
+    public void setSmsSignText(String smsSignText) {
+        this.smsSignText = smsSignText;
+    }
+
+    public String getSmsAppid() {
+        return smsAppid;
+    }
+
+    public void setSmsAppid(String smsAppid) {
+        this.smsAppid = smsAppid;
+    }
+
+    public Integer getUseType() {
+        return useType;
+    }
+
+    public void setUseType(Integer useType) {
+        this.useType = useType;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+}