Merge branch '2.6.9' into wvp-28181-2.0

648540858

2024-01-04 a2cac5ca12f100d052cb31122a84de4bba829bca

 src/main/java/com/genersoft/iot/vmp/storager/dao/dto/User.java

old mode 100644
new mode 100755