Merge branch 'master' of http://101.37.171.70:10101/r/SRM-LAYUI

YL

2021-12-17 928efc9371c839b16d6de724eeb21dd29e4077e6

 WebSRM/layuiAdmin.std-v1.2.1/src/views/grf/条码.grf

@@ -71,7 +71,7 @@
         End
      End
      Object ColumnContent
         Height=6.00604
         Height=6.19125
         RowsPerPage=1
         Items ColumnContentCell
            Item
@@ -82,10 +82,10 @@
                  Item
                     Type=ShapeBox
                     Name='ShapeBox1'
                     Left=0.211667
                     Left=0.396875
                     Top=0.211667
                     Width=8.59896
                     Height=5.58271
                     Height=5.97958
                  End
                  Item
                     Type=MemoBox
@@ -202,10 +202,10 @@
                  Item
                     Type=MemoBox
                     Name='MemoBox10'
                     Left=4.57729
                     Top=4.20688
                     Width=2.40771
                     Height=0.582083
                     Left=0.608542
                     Top=5.3975
                     Width=2.59292
                     Height=0.608542
                     Object Font
                        Name='瀹嬩綋'
                        Weight=400
@@ -288,7 +288,7 @@
                     Name='FieldBox6'
                     Left=1.98438
                     Top=4.78896
                     Width=2.80458
                     Width=6.40292
                     Height=0.608542
                     Object Font
                        Name='瀹嬩綋'
@@ -339,10 +339,10 @@
                  Item
                     Type=FieldBox
                     Name='FieldBox9'
                     Left=6.00604
                     Top=4.20688
                     Width=2.38125
                     Height=0.582083
                     Left=2.19604
                     Top=5.3975
                     Width=2.40771
                     Height=0.608542
                     Object Font
                        Name='瀹嬩綋'
                        Weight=400