Merge remote-tracking branch 'origin/v1.0' into v1.0

# Conflicts:
#	src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@@ -332,6 +332,9 @@ public class SysUserController {
         if(param.getSyAccount()==null){
             param.setSyAccount(userBo.getCode());
         }
+        if(!StringUtils.hasText(param.getId())) {
+            param.setId("SU" + IdUtil.getSnowFlakeId());
+        }
         param.setServingState(0);
         param.setId("SU"+IdUtil.getSnowFlakeId());
         boolean result = sysUserService.save(param);