Merge remote-tracking branch 'origin/master'

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MidIncidentAuditDetail.java

@@ -127,6 +127,10 @@ public class MidIncidentAuditDetail implements Serializable {
 	@Excel(name = "规则处理结果", width = 15)
     @ApiModelProperty(value = "规则处理结果")
     private java.lang.String description;
+    /**违规金额*/
+    @Excel(name = "违规金额", width = 15)
+    @ApiModelProperty(value = "违规金额")
+    private java.lang.Double amount;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/websocket/WebSocket.java

@@ -67,6 +67,7 @@ public class WebSocket {
      * @param message
      */
     public void pushMessage(String ipStr, String message) {
+        log.info("ip:{} 发送websocket消息:{}", ipStr, message);
         for (Map.Entry<String, Session> item : sessionPool.entrySet()) {
             //userId key值= {用户id + "_"+ 登录token的md5串}
             //TODO vue2未改key新规则，暂时不影响逻辑