Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-10-14 eb333423df568777c7965e3828898f2a835078ff

Merge remote-tracking branch 'origin/test' into test

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml

@@ -67,7 +67,8 @@
            ca.`name` as classifyName,
            p.examine_at,
            c.name  communityName,
            p.urban_status
            p.urban_status,
            p.transfer_reason
        FROM
            com_act_easy_photo p
            LEFT JOIN sys_user u ON p.sponsor_id = u.user_id

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServerHandler.java

@@ -59,7 +59,7 @@
        if (msg.toString().startsWith("4A1802")) {
            myTools.writeToClient("404A021823", ctx, "状态包");
        }
        if (msg.toString().startsWith("4A0C0134")) {
        if (msg.toString().startsWith("4A0C01")) {
            myTools.writeToClient("404A01" + DateUtils.getDateFormatString(new Date(), "HHmmss") + "23", ctx, "心跳包");
        }
        if (msg.toString().startsWith("4A1803")) {