#

vincentlu

10 小时以前 324914bbc8f6342170ce2d3041af7f9f0ead535a

#

 zy-acs-flow/src/i18n/en.js

@@ -188,7 +188,7 @@
                token: "token",
                ip: "ip",
                type: "type",
                system: "system",
                systemName: "system",
            },
            dept: {
                name: "name",

 zy-acs-flow/src/i18n/zh.js

@@ -188,7 +188,7 @@
                token: "token",
                ip: "ip",
                type: "类型",
                system: "系统",
                systemName: "系统",
            },
            dept: {
                name: "部门名称",

 zy-acs-flow/src/page/userLogin/UserLoginCreate.jsx

@@ -119,8 +119,8 @@
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.userLogin.system"
                                        source="system"
                                        label="table.field.userLogin.systemName"
                                        source="systemName"
                                        parse={v => v}
                                    />
                                </Grid>

 zy-acs-flow/src/page/userLogin/UserLoginEdit.jsx

@@ -97,8 +97,8 @@
                                source="type"
                            />
                            <TextInput
                                label="table.field.userLogin.system"
                                source="system"
                                label="table.field.userLogin.systemName"
                                source="systemName"
                                parse={v => v}
                            />
                        </Stack>

 zy-acs-flow/src/page/userLogin/UserLoginList.jsx

@@ -72,7 +72,7 @@
    <TextInput source="token" label="table.field.userLogin.token" />,
    <TextInput source="ip" label="table.field.userLogin.ip" />,
    <NumberInput source="type" label="table.field.userLogin.type" />,
    <TextInput source="system" label="table.field.userLogin.system" />,
    <TextInput source="systemName" label="table.field.userLogin.systemName" />,

    <TextInput label="common.field.memo" source="memo" />,
    <SelectInput
@@ -122,7 +122,7 @@
                    rowClick={(id, resource, record) => false}
                    expand={() => <UserLoginPanel />}
                    expandSingle={true}
                    omit={['id', 'memo', 'type', 'system', 'updateTime']}
                    omit={['id', 'memo', 'type', 'systemName', 'updateTime']}
                >
                    <NumberField source="id" />
                    <ReferenceField source="userId" label="table.field.userLogin.userId" reference="user" link={false}>
@@ -131,7 +131,7 @@
                    <TextField source="token" label="table.field.userLogin.token" />
                    <TextField source="ip" label="table.field.userLogin.ip" />
                    <NumberField source="type" label="table.field.userLogin.type" />
                    <TextField source="system" label="table.field.userLogin.system" />
                    <TextField source="systemName" label="table.field.userLogin.systemName" />

                    <DateField source="createTime" label="common.field.createTime" showTime />
                    <TextField source="memo" label="common.field.memo" sortable={false} />

 zy-acs-flow/src/page/userLogin/UserLoginPanel.jsx

@@ -66,8 +66,8 @@
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.userLogin.system"
                                property={record.system}
                                title="table.field.userLogin.systemName"
                                property={record.systemName}
                            />
                        </Grid>


 zy-acs-manager/src/main/java/com/zy/acs/manager/common/CodeBuilder.java

@@ -69,6 +69,7 @@
  TRUNCATE man_task_log;
  TRUNCATE man_travel_log;
  TRUNCATE man_action_log;
  TRUNCATE sys_user_login

  # init
  TRUNCATE man_code;

 zy-acs-manager/src/main/java/com/zy/acs/manager/system/entity/UserLogin.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonAlias;
import com.zy.acs.manager.system.service.TenantService;
import com.zy.acs.manager.system.service.UserService;
import com.zy.acs.framework.common.Cools;
@@ -75,7 +76,7 @@
     * 登录系统
     */
    @ApiModelProperty(value= "登录系统")
    private String system;
    private String systemName;

    /**
     * 备注