conflect fix

Helius

2021-06-11 289b0503bc197d196997142f60b3a8ef8b70f0cc

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html

@@ -187,11 +187,13 @@
                break;
            case '需配料':
                html +=btns[3].replace('VALUE',value);
                html += btns[2].replace('VALUE',value);
                break;
            case '配料完成':
                break;
            case '服务完成':
                html +=btns[4].replace('VALUE',value);
                html += btns[2].replace('VALUE',value);
                break;
        }
        html += btns[5].replace('VALUE',value);