Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2021-06-16 755262ba9a1a3c0573a0e910bbd0a353e9e2a2c5

 java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java

old mode 100644
new mode 100755
@@ -16,6 +16,7 @@
public class MachineDto extends PageDto implements Serializable {

    public static final String MACHINE_TYPE_CAR = "9996";
    public static final String MACHINE_TYPE_ACCESS_CONTROL = "9999";
    public static final String MACHINE_STATE_ON = "1200";
    public static final String MACHINE_STATE_OFF = "1300";