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

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/SubscriptionApply.java

@@ -50,10 +50,9 @@ public class SubscriptionApply extends BaseEntity
     private Integer recordStatus;
 
     /** 申请时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty(value = "申请时间")
-    private Date applyDate;
+    private String applyDate;
 
     /** 修改时间  */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -115,15 +114,15 @@ public class SubscriptionApply extends BaseEntity
     {
         return recordStatus;
     }
-    public void setApplyDate(Date applyDate)
-    {
-        this.applyDate = applyDate;
-    }
 
-    public Date getApplyDate()
-    {
+    public String getApplyDate() {
         return applyDate;
     }
+
+    public void setApplyDate(String applyDate) {
+        this.applyDate = applyDate;
+    }
+
     public void setModifiedTime(Date modifiedTime)
     {
         this.modifiedTime = modifiedTime;

carbon-back/carbon-back-service/src/main/resources/carbon/SubscriptionApplyMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hcloud.microserver.h5.dao.SubscriptionApplyMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.SubscriptionApplyMapper">
     
     <resultMap type="SubscriptionApply" id="SubscriptionApplyResult">
         <result property="guid"               column="guid"    />

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/entity/SubscriptionApply.java

@@ -51,8 +51,7 @@ public class SubscriptionApply extends BaseEntity
     /** 申请时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
-    @ApiModelProperty(value = "申请时间")
-    private Date applyDate;
+    private String applyDate;
 
     /** 修改时间  */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -114,15 +113,15 @@ public class SubscriptionApply extends BaseEntity
     {
         return recordStatus;
     }
-    public void setApplyDate(Date applyDate)
-    {
-        this.applyDate = applyDate;
-    }
 
-    public Date getApplyDate()
-    {
+    public String getApplyDate() {
         return applyDate;
     }
+
+    public void setApplyDate(String applyDate) {
+        this.applyDate = applyDate;
+    }
+
     public void setModifiedTime(Date modifiedTime)
     {
         this.modifiedTime = modifiedTime;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/service/impl/SubscriptionApplyServiceImpl.java

@@ -68,7 +68,7 @@ public class SubscriptionApplyServiceImpl implements ISubscriptionApplyService
         apply.setApplyCustomName(applyCustomName);
         apply.setRecordStatus(1);
         apply.setApplyStatus(0);
-        apply.setApplyDate(DateUtils.getNowDate());
+        apply.setApplyDate(DateUtils.getDate());
 
         apply.setModifiedTime(DateUtils.getNowDate());
         apply.setCreateTime(DateUtils.getNowDate());