Merge branch 'dev' into 'master'

fix: 小程序消息bug修改XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX

See merge request !15

common/src/main/java/com/onsiteservice/common/service/MiniAppMessageService.java

@@ -82,7 +82,7 @@ public class MiniAppMessageService {
                         new WxMaSubscribeMessage.MsgData("thing7", order.getServiceName()),
                         new WxMaSubscribeMessage.MsgData("thing11", valuatorUser.getUserName()),
                         new WxMaSubscribeMessage.MsgData("phone_number16", valuatorUser.getPhone()),
-                        new WxMaSubscribeMessage.MsgData("thing5", StringUtils.defaultString(remark, "-")));
+                        new WxMaSubscribeMessage.MsgData("thing5", StringUtils.isEmpty(remark)? "-" : remark));
         sendSubscribeMsg(valuatorTmp, user.getOpenId(), data);
     }