upgrade

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgDetail.lua

@@ -40,9 +40,19 @@ function TRPSysMsgDetail:onShowFrame(cs)
 end
 -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
 function TRPSysMsgDetail:show()
-    self.uiobjs.LabelContent.text = joinStr("　", self.mdata.CONTENT)
-    self.uiobjs.LabelTime.text = self.mdata.CREATETIME and DateEx.formatByMs(tonumber(self.mdata.CREATETIME) * 1000) or ""
-    self.uiobjs.LabelTitle.text = self.mdata.TITLE
+    self.uiobjs.LabelContent.text = joinStr("　", self.mdata.CONTENT or self.mdata.content)
+    
+    local time = self.mdata.CREATETIME or self.mdata.createTime
+    if time then
+        if(type(time) == "string") then
+            self.uiobjs.LabelTime.text = time
+        else
+            self.uiobjs.LabelTime.text = DateEx.formatByMs(time * 1000)
+        end
+    else
+        self.uiobjs.LabelTime.text = ""
+    end
+    self.uiobjs.LabelTitle.text = self.mdata.TITLE or self.mdata.title
     self.uiobjs.scrollView:ResetPosition()
 end