Merge branch 'develop' of gitee.com:darlk/ShengTangManage into develop

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java

@@ -181,6 +181,7 @@ public class SysOrder extends BaseEntity {
     @Excel(name = "成交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date orderTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getStartTime() {
         return startTime;
     }

stdiet-custom/src/main/java/com/stdiet/custom/page/WxServeInfo.java

@@ -62,7 +62,7 @@ public class WxServeInfo implements Serializable {
     }
 
     public void setWeight(BigDecimal weight) {
-        this.weight = weight.toString() + "kg";
+        this.weight = weight.toString() + "斤";
     }
 
     @Override