Merge branch 'sl8540_common' of server-git:incartech/protocol_srv into sl8541_common
authorSnickerSun <scy@incartech.cn>
Wed, 25 Aug 2021 10:54:46 +0000 (18:54 +0800)
committerSnickerSun <scy@incartech.cn>
Wed, 25 Aug 2021 10:54:46 +0000 (18:54 +0800)
commit70f21d0c687b89a03fc7d9738d41be1e6c15ea03
treea612b619f75a5491c6ac94e78d2584a6464579de
parente4f21c41ab78188904ed8e3148c8e9d6d4ae1e19
parent9610baf922e928dda666ac6d00cba7a15c129db2
Merge branch 'sl8540_common' of server-git:incartech/protocol_srv into sl8541_common
app/src/main/java/com/ic/protocolSrv/Config.java
app/src/main/java/com/ic/protocolSrv/CoreService.java
app/src/main/java/com/ic/protocols/protocol_fzd.java