Merge branch 'master' of ssh://47.100.14.92:2289/sikang/lib_base

bug fix.

src/main/java/com/common/bean/LatestLoanAppBean.java

@@ -123,6 +123,7 @@ public class LatestLoanAppBean implements Parcelable {
     public void setCouponId(long couponId) {
         this.couponId = couponId;
     }
+
     public long getProductId() {
         return productId;
     }
@@ -148,7 +149,7 @@ public class LatestLoanAppBean implements Parcelable {
     }
 
     public String getDueDate() {
-        return this.dueDate;
+        return this.dueDate.replace("T"," ").replace("Z","");
     }
 
     public void setDueDate(String dueDate) {
@@ -332,7 +333,7 @@ public class LatestLoanAppBean implements Parcelable {
     }
 
     public String getCreateTime() {
-        return this.createTime;
+        return this.createTime.replace("T", " ").replace("Z", "");
     }
 
     public void setCreateTime(String createTime) {

src/main/java/tech/starwin/utils/format_utils/StringFormat.java

@@ -166,7 +166,7 @@ public class StringFormat {
      * 格式化时间
      */
     public static String convertTime(String srcTime, String formatStyle) {
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT00:00"));
         SimpleDateFormat simpleDateFormatLocal = new SimpleDateFormat(formatStyle);
         simpleDateFormatLocal.setTimeZone(TimeZone.getDefault());