Merge branch 'test-xq_tixian' into test-xq1

src/main/java/com/ydtech/modules/admin/model/SysUser.java

@@ -262,6 +262,9 @@ public class SysUser extends BaseEntity {
     @TableField(value = "new_app")
     private int newApp;
 
+    @ApiModelProperty("是否内部工号0-否；1-是")
+    @TableField(value = "internal_id")
+    private boolean internalId;
 
     /**
      * 验证用户

src/main/java/com/ydtech/modules/admin/service/impl/SysAmountAuditingServiceImpl.java

@@ -144,11 +144,12 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             //插入轨迹表
             SysAmountAuditingHistory sysAmountAuditingHistory =new SysAmountAuditingHistory(null, sysAmountAuditingEntity.getId(), amount, userId,new Date(),"4", "1",sysUserAccountHistory.getId());
             sysAmountAuditingHistoryService.save(sysAmountAuditingHistory);
-            sendLgParams(sysAmountAuditingEntity,sysAmountAuditingHistory.getAuditingStatus());
         }
     }
 
 
+    //sendLgParams(sysAmountAuditingEntity,sysAmountAuditingHistory.getAuditingStatus());
+    //   线下提现取消推送
     public void sendLgParams(SysAmountAuditingEntity sysAmountAuditingEntity,String auditingStatus){
         PushLgEntity lgEntity = new PushLgEntity();
         lgEntity.setApplicationTime(new Date());