解决冲突

This commit is contained in:
wangshiming
2022-02-24 20:07:16 +08:00
parent 2107de50d7
commit c1749e383c

View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-05 11:01:55 * @Date : 2022-01-05 11:01:55
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-02-24 20:01:39 * @LastEditTime : 2022-02-24 20:06:26
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -103,8 +103,8 @@ export class ContractManagementTemplateTextComponent implements OnInit {
type: 'string', type: 'string',
title: '承包商对象', title: '承包商对象',
enum: [ enum: [
{ label: '货主', value: 1 }, { label: '货主', value: '1' },
{ label: '司机', value: 2 } { label: '司机', value: '2' }
], ],
ui: { ui: {
widget: 'select', widget: 'select',