Merge branch 'dev'

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/TopSysLoginService.java

@@ -83,6 +83,7 @@ public class TopSysLoginService
             if(password.length()>20){
                 password = AES.decrypt(password,rsaPrivate);
             }
+            System.out.println("password = " + password);
             // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
             authentication = authenticationManager
                     .authenticate(new UsernamePasswordAuthenticationToken(username, password));

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/service/impl/DistributionActivityTemplateServiceImpl.java

@@ -477,6 +477,7 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
 
     @Override
     public List<TenantOrderVo> getOrgOrder(TenantOrderQueryBo bo) {
+
         List<TenantOrderVo> orgOrder = iDistributionActivityService.getOrgOrder(bo);
         if (CollectionUtils.isNotEmpty(orgOrder)){
             orgOrder.forEach(item -> {