合并sf代码

sf_machine_connect/views/compensation.xml

@@ -11,12 +11,13 @@
                         <field name="compensation_value_y"/>
                     </group>
                     <div>
+                        <field name="button_compensation_state"/>
                         <button string="一键补偿" name="compensation" type="object" confirm="是否确认下发补偿" class="btn-primary"/>
+<!--                        <button string="显示补偿" name="compensation1" type="object" confirm="是否确认下发补偿" class="btn-primary"/>-->
+<!--                        <button string="修改状态" name="get__state" type="object" class="btn-primary"/>-->
+
                     </div>
-
-
                 </xpath>
-<!--             attrs='{"invisible": [("routing_type","!=","CNC加工")]}'-->
 
         </field>
     </record>